Resolve selected merge conflicts using p4merge in GIT

Question

Is there a way to resolve the selected file with conflicts using p4merge in GIT?

Suppose there are 25 conflicts, and each conflict must be resolved by each developer if any developer runs 'git mergetool', p4merge, which starts with the first conflict. this conflict cannot be related to these developers, so we are looking for a way when a developer can resolve a specific conflict file using the p4merge tool that is called from Unix.

Or is there a way for GIT to show the $ BASE $ LOCAL $ REMOTE version / commit so that I can use this in gui p4merge mode to resolve the conflict.

Answer 1

You looked at this: http://www.andymcintosh.com/?p=33