Forgot git rebase --continue

I was on my own local feature branch and wanted to merge it into master. I checked out master, did git pull --rebase, had one conflict, resolved it, but I forgot to do git rebase --continue after that. Then I did git merge my_other_branch and then wanted to push that to origin, but git told me im not on any branch, so I was like "oh no, i fogot rebase --continue" so I did it then and git says "no changes - did you forget to use git add?". So right now I'm not on any branch...in some detached head state.

What do I need to do to get back on track?

Answers


git rebase --skip

Should continue the rebase.


Need Your Help

How to select 700 random records from an access table?

c# ms-access

This code give me the last 700 records, not 700 random records.

Stack overflow from .NET code in IIS, but not in Winforms

.net debugging iis stack windbg

So I have a nasty stack overflow I have been trying to track down / solve for the past 8 hours or so, and I'm at the point where i think i need advice.

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.