How resolve multiple conflicts with “git mergetool” without having to close the editor between files?

by

At first glance, it does not seem possible to reuse an external diff tool session.

The git-mergetool documentation clearly states:

If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool.<tool>.trustExitCode can be set to true.
Otherwise, git-mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited.

So the exit code (or the validation of the user after the exit of the diff tool) is needed, implying that the user first close the external diff tool.

That seems a great incentive to reduce the number of conflicts on each merge/rebase one attempts 😉 (whatever the VCScs tool used)

Note:
Two other git external diff tools settings (“Setting up diff and merge tools for Git on Windows” and “Setting up SourceGear DiffMerge with Git“) do not give more hopes when it come to not closing the external diff tool…

More Related Contents:

  1. How do I show the changes which have been staged?
  2. How can I see the changes in a Git commit?
  3. How to grep (search) committed code in the Git history
  4. What are the differences between double-dot “..” and triple-dot “…” in Git diff commit ranges? [duplicate]
  5. Can I make git recognize a UTF-16 file as text?
  6. What is `git diff –patience` for?
  7. Can I use git diff on untracked files?
  8. How to see the changes between two commits without commits in-between?
  9. Filter git diff by type of change
  10. How can I get the diff between all the commits that occurred between two dates with Git?
  11. use Winmerge inside of Git to file diff
  12. In the context of git (and diff), what is a “hunk”
  13. Coloring white space in git-diff’s output
  14. Where does the excerpt in the git diff hunk header come from?
  15. How do you take a git diff file, and apply it to a local branch that is a copy of the same repository?
  16. What does “@@ -1 +1 @@” mean in Git’s diff output?
  17. diff returning entire file for identical files
  18. Make ‘git diff’ ignore ^M
  19. How can I configure KDiff3 as a merge tool and diff tool for git?
  20. What does the “@@…@@” meta line with at signs in svn diff or git diff mean?
  21. Ignore *all* whitespace changes with git-diff between commits
  22. Viewing all `git diffs` with vimdiff
  23. View differences of branches with meld?
  24. Using git to identify all modified functions in a revision
  25. How to apply `git diff` patch without Git installed?
  26. ‘git status’ shows changed files, but ‘git diff’ doesn’t
  27. Highlight changed lines and changed bytes in each changed line
  28. Show both staged & working tree in git diff?
  29. Show git diff, ignoring file permission changes?
  30. How to perform a three-way diff in Git without merging?

Leave a Comment