tags:

views:

19

answers:

1
Q: 

Git Specific Messages in the file

In a file that I am using, I merged two branches one after the other to the master. So I had branch1, branch2 and master. First, I merged branch1 and then branch2. In the final version of the file in master, I am having a messages like

<<<<<<<<HEAD
branch2-messages
========
Branch1-message
>>>>>>>> branch1

branch2-messages is the branch2 specific change to the file and Branch1-message is the branch1 specific change to the file.Why does these messages appear in the final file?.

+1  A: 

THis is called a conflict. You edited the same file at the same spot in both branches and git was unable to descide how to create the final merged file without losing information, so it created this conflict information.

Here is the manual about how to resolve conflicts.

ZeissS  2010-07-15 07:10:42
you should also mention `git mergetool` which simplifies matters usually
Tobias Kienzler  2010-07-15 11:08:51

related questions

How to have two remote orgins for Git?
Why is branching and merging easier in Mercurial than in Subversion?
Is there a better way of writing a git pre-commit hook to check any php file in a commit for parse errors ?
Bug tracker setup with Git integration?
Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?
git-stash vs. git-branch
Git "bad sha1 file" error
Should I use GitHub+Fogbugz or Assembla?
How do you remove a specific revision in the git history?
How do you organise multiple git repositories?
What is the Difference Between Mercurial and Git?
How do I restore files to previous states in git?
Is there anything like TortoiseCVS and TortoiseSVN for git?
Good Git repository viewer for Mac
Deploying a Git subdirectory in Capistrano
How to "unversion" a file in either svn and/or git
How can I graph the Lines of Code history for git repo?
Switch branch names in git
Migrating to GIT
How can I set up an editor to work with Git on Windows?
How do you deal with configuration files in source control?
Undoing a git reset --hard HEAD~1
Version Control. Getting started...
Why is Git better than Subversion?
Distributed source control options