GIT 2 or more merge conflicts in a single file - how p4merge handles?

Question

1. GIT p4merge - 2 or more conflict in same file

I have integrated p4merge with GIT and i came across this situation once.

I have a file with merge con

Answer 1

1. My guess: when you save file in p4merge, it happilly return with code 0, file is changed, and git assumes that conflicts were resolved. There is a config parameter mergetool.<tool>.trustExitCode (mergetool.p4merge.trustExitCode in your case), which can be set to false, so git will always ask you if merge was successfull after running git mergetool (which can be quite annoying). You also might be able to write a wrapper for p4merge which will check presence of conflict markers after running p4mege, or pre-commit hook, which rejects commits containing files containing such markers, though I've never done something like that.

2. Yes, you can run git mergetool <file> to resolve specified file. Learn more here.