Git merge left HEAD marks in my files

by

Those are conflict markers. You’re still in the process of merging, but there were some parts that Git couldn’t merge automatically. You’ll need to hand-edit those parts to what you want them to be and then commit the results.

For instance, in your particular case, you’d probably want to resolve it like this (note – the arrows/text on the right are just my notes, not something you’d type into the file):

integer = 
<<<<<<< HEAD                                  <-+ remove the bits here
    digits:[0-9]+                               |
        { return digits.join(""); }             |
=======                                       <-+
    sign:"-"* digits:[0-9]+
        { return sign + digits.join(""); }
>>>>>>> gh-pages                              <-- and this

and thus you’d save the file as…

integer = 
    sign:"-"* digits:[0-9]+
        { return sign + digits.join(""); }

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. I ran into a merge conflict. How can I abort the merge?
  3. Resolve Git merge conflicts in favor of their changes during a pull
  4. I ran into a merge conflict. How do I abort the merge?
  5. What’s the simplest way to list conflicted files in Git?
  6. How do I fix a merge conflict due to removal of a file in a branch?
  7. Sharing rerere cache
  8. Undo a Git merge that hasn’t been pushed yet
  9. How to cherry-pick a range of commits and merge them into another branch?
  10. Have Git Select Local Version On Merge Conflict on a Specific File?
  11. How can I selectively merge or pick changes from another branch in Git?
  12. Git workflow and rebase vs merge questions
  13. How can I merge multiple commits onto another branch as a single squashed commit?
  14. Merge, update, and pull Git branches without using checkouts
  15. Re-doing a reverted merge in Git
  16. Is there a git-merge –dry-run option?
  17. How can I merge two commits into one if I already started rebase?
  18. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  19. How do I safely merge a Git branch into master?
  20. git remove merge commit from history
  21. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  22. tell git to use ours merge strategy on specific files
  23. git merge, keep both
  24. Merge development branch with master
  25. how can I customize git’s merge commit message?
  26. Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)
  27. How can I configure KDiff3 as a merge tool and diff tool for git?
  28. How to merge specific files from Git branches
  29. git: merge two branches: what direction?
  30. Restore git files deleted after git merge –abort

Leave a Comment