如何离开由“ git pull --rebase”创建的时间分支？

Question

While being in a branch I have executed

git pull --rebase origin master

This have been resulted in some merge conflicts. By opening the files and selecting the needed parts of the code I have resolved the conflicts. Then I have executed git add and git commit .

Now, when I execute, git branch , I see that I am not in the original branch but in a branch named:

(no branch, rebasing my_branch_name)

The git status tells:

rebase in progress; onto 5ae1f3d58
You are currently rebasing branch 'my_branch_name' on '7af1d3d38'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean

However, when I execute git rebase --continue , as suggested, nothing changes. I stills stay in this strange temporal branch. So, how can I go back to my branch and keep changes introduced by the git pull --rebase and the manual merge?

Answer 1

On rebase , the conflict will be listed. You need to solve the conflicts in each file.

Find the conflicted files.

conflict will look like this

<<<<<<< HEAD
code from master branch
>>>>>>>>>>>>>>
<<<<<<<<< <some_commit_id>
code from your local file
>>>>>>>>>>>>>>>>>>>>>>>`

Edit that part and keep the code you actually want.

Then in terminal add the files to git using

git add <file_name>

After all conflicts get resolved and added to git

run git rebase --continue

If you don't want to do any of this and wants old code before rebase, simply run git rebase --abort

Answer 2

When resolving conflicts in rebase you do not need to run git commit before git rebase --continue , this is probably the cause of the issue

If you do then git commit --rebase will try to commit the change and get confused as nothing has changed.

The easiest option is probably to undo the last commit and then continue

git reset HEAD^
git rebase --continue

If you ever get too deep into a rebase that goes wrong you can also git rebase --abort and try starting over.