Which version of the git file will be finally used: LOCAL, BASE or REMOTE?

by

It’s the one in the middle : BASE.

In fact, BASE is not the common ancestor, but the half-finished merge where conflicts are marked with >>>> and <<<<.

You can see the file names on the top of meld editing window.

See the screenshot here

meld base

You can edit the BASE file as you want with or without using meld commands.
You can also get rid of meld and just edit the file with your favorite text editor.

  • The code between <<<< HEAD and ===== markers is the one of your local file before the merge.
  • The code between ==== and >>>> <branch name> is the one of the remote file.

More Related Contents:

  1. Undo a Git merge that hasn’t been pushed yet
  2. I ran into a merge conflict. How can I abort the merge?
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Is there a “theirs” version of “git merge -s ours”?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. Is there a git-merge –dry-run option?
  9. When would you use the different git merge strategies?
  10. What’s the difference between ‘git merge’ and ‘git rebase’?
  11. How do I safely merge a Git branch into master?
  12. I ran into a merge conflict. How do I abort the merge?
  13. What’s the simplest way to list conflicted files in Git?
  14. Git merge hotfix branch into feature branch
  15. Get changes from master into branch in Git
  16. Git merge error “commit is not possible because you have unmerged files”
  17. Merge development branch with master
  18. how can I customize git’s merge commit message?
  19. error: Your local changes to the following files would be overwritten by checkout
  20. How do I fix a merge conflict due to removal of a file in a branch?
  21. Tell git not to merge binary files but to choose
  22. How to keep a branch synchronized/updated with master?
  23. How to merge specific files from Git branches
  24. View differences of branches with meld?
  25. git: merge two branches: what direction?
  26. Telling if a Git commit is a Merge/Revert commit
  27. Git merge branch into master
  28. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. How do you detect an evil merge in git?

Leave a Comment