Hello All,
I have two files rpc-devexprcpseq-nav.rb and readme.txt.
My workflow is as follows.
1.Checkout from master to work branch.
2.While in the work branch,delete data from rpc-devexprcpseq-nav.rb
and paste the same data with indentation.(Note here that nothing has
been changed in the code,only proper indentation has been provided)
3.While in the work branch,delete data from the readme.txt and add new
4.Stage and commit the files using git add and git commit -m "Message"
5.Checkout to master branch.
6.Do a 'git merge work' from the master branch.
While doing the above I get an error as follows:-

Auto-merging lib/rpc-devexprcpseq-nav.rb
CONFLICT (content): Merge conflict in lib/rpc-devexprcpseq-nav.rb
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.

In order to resolve this merge conflict do I need to remove the
spacing in the code????

As I am new to git,I want to know what does the following indicate?
<<<<<<< HEAD
>>>>>>> work
These have been introduced in both the files after the merge.
Thanks in Advance :)


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to