I am trying to build a custom mergetool for git that knows more about specific files than git does.
This program will analyze the files that pop up during a merge conflict and for some of them, in some specific cases, it will know how to handle them successfully.
I execute this tool like this:
git mergetool --tool=auto
This successfully runs my program.
However, if the program fails to merge a file, and thus exits with a non-zero exit code I get this prompt from git:
Continue merging other unresolved paths [y/n]? n
Is there a way for me to configure git, or return a specific exit code, that tells git to just keep trying the rest of the files without user intervention?
ie. something like:
git mergetool --tool=auto --continue-always
or some magic exit code that means the same (or any other way to do the same)?
I've configured my mergetool with "trustExitCode = true" if that matters.
The ultimate goal would be that if a merge conflict occurs, I would first run the automagic program, and then use a normal mergetool, like KDiff3 or Beyond Compare, to merge the rest of the files manually.
