Question about 'git branching'
- by michael
Hi,
I read this about git branch:
http://book.git-scm.com/3_basic_branching_and_merging.html
so I follow it and create 1 branch : experimental
And I
1. switch to experimental branch (git checkout experimental)
2. make a bunch of changes
3. commit it (git commit -a)
4. switch to master branch (git checkout master)
5. make some changes and commit there
6. switch back to experimental (git checkout experimental)
7. merge master change to experimental (git merge master)
8. 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?
Thank you.
