1. get latest revision from deopt
2. resolve it with merging (skip if there is conflict)
For that I created the file 'GetLatestAndResolve.bat' with these commands:
p4 sync %1#head p4 resolve -a %1
Then I added a custom tool that calls to the above file and passes %d as argument.
I have 2 questions:
1. If I select multiple files and use the custom tool I created, only one file is being processed, what I'm missing?
2. What's the different between
both should resolve with merging and skip if there is conflict.