I’ve read the Basic Branching and Merging section of the Git Community Book.
So I follow it and create one branch: experimental
.
Then I:
- switch to experimental branch (git checkout experimental)
- make a bunch of changes
- commit it (git commit -a)
- switch to master branch (git checkout master)
- make some changes and commit there
- switch back to experimental (git checkout experimental)
- merge master change to experimental (git merge master)
-
there are some conflicts but after I resolve them, I did ‘git add myfile’
-
And now i am stuck, I can’t move back to master
when I do
$ git checkout master
error: Entry 'res/layout/my_item.xml' would be overwritten by merge. Cannot merge.
and I did:
$ git rebase --abort
No rebase in progress?
and I did :
$ git add res/layout/socialhub_list_item.xml
$ git checkout master
error: Entry 'res/layout/my_item.xml' would be overwritten by merge. Cannot merge.
What can I do so that I can go back to my master branch?