Git Interactive Merge?

by

Yes, but it will mostly be by manually making that happen. You’ll tell Git you’re merging the two relevant branches, but that it shouldn’t try to commit the result on its own, (edited to add: nor fast-forward if it thinks the merge is trivial):

git merge --no-commit --no-ff branch-to-merge

Then you’ll ask git for the file as it appeared in the two branches:

git show HEAD:filename >filename.HEAD
git show branch-to-merge:filename >filename.branch

and their merge base,

git show `git merge-base HEAD branch-to-merge`:filename  >filename.base

You’ll merge them using whatever tool you want (e.g.)

meld filename.{HEAD,branch,base}

you’ll stage that (git add filename), and then commit the merge (git commit).

More Related Contents:

  1. Ignore files that have already been committed to a Git repository [duplicate]
  2. Git for beginners: The definitive practical guide
  3. How to list branches that contain a given commit?
  4. Which commit has this blob?
  5. How can I make git accept a self signed certificate?
  6. What is a tracking branch?
  7. Git: “Corrupt loose object”
  8. What is the difference between “git init” and “git init –bare”?
  9. I ran into a merge conflict. How do I abort the merge?
  10. What are .git/info/grafts for?
  11. git – skipping specific commits when merging
  12. How to perform better document version control on Excel files and SQL schema files
  13. How do I get my ‘Detached HEAD’ commits back into master [duplicate]
  14. Get changes from master into branch in Git
  15. Git mergetool generates unwanted .orig files
  16. git diff between cloned and original remote repository
  17. git: switch branch without detaching head
  18. git-svn: what’s the equivalent to `svn switch –relocate`?
  19. git commit frequency
  20. How do I reset or revert a file to a specific revision?
  21. Is there a migration tool from CVS to Git?
  22. How do I check out a specific version of a submodule using ‘git submodule’?
  23. Differences between git pull origin master & git pull origin/master
  24. Ignoring an already checked-in directory’s contents?
  25. Git Ignores and Maven targets
  26. Git: How to make outer repository and embedded repository work as common/standalone repository?
  27. Is there a way to compare two diffs or patches?
  28. How to perform a three-way diff in Git without merging?
  29. Clone only the .git directory of a git repo
  30. Other consequences of `git push –force`?

Leave a Comment