Git conflict markers [duplicate]
This question already has answers here: Git merge left HEAD marks in my files (6 answers) Closed 9 years ago.
After I pulled from remote branch, I got conflict, when I open the file it looks something like below:
<<<<<<< HEAD:file.txt
Hello world
=======
Goodbye
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
I need some explanations of the markers, which portion of code is pulled from remote and which is from local?
What does the code 77976da35a11db4580b80ae27e8d65caf5208086 stand for?
The line (or lines) between the lines beginning <<<<<<< and ====== here:
<<<<<<< HEAD:file.txt
Hello world
=======
... is what you already had locally - you can tell because HEAD points to your current branch or commit. The line (or lines) between the lines beginning ======= and >>>>>>>:
=======
Goodbye
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt
... is what was introduced by the other (pulled) commit, in this case 77976da35a11. That is the object name (or "hash", "SHA1sum", etc.) of the commit that was merged into HEAD. All objects in git, whether they're commits (version), blobs (files), trees (directories) or tags have such an object name, which identifies them uniquely based on their content.
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How to remove local (untracked) files from the current Git working tree
- How do I resolve merge conflicts in a Git repository?
- What is the difference between 'git pull' and 'git fetch'?
- How do I undo 'git add' before commit?
- How do I force "git pull" to overwrite local files?
- How do I check out a remote Git branch?
- How do I delete a Git branch locally and remotely?
- How do I revert a Git repository to a previous commit?
- How do I rename a local Git branch?
pull