I use git a fair bit but would like a bit of advice on mergetool integration...
I have plugged in p4merge, which I think is an excellent visual mergetool considering its free... however I have found that regardless of the settings you use such as trustExitCode, 50% of the time, it leaves all of the diff files in place, and the other 50% it does delete those temp files but still leaves the .orig file...
Can anyone help me on making concluding a merge neatly and seamlessly?
Just for added info, my process is like this:
• do a pull, and realise there is a merge conflict
• mergetool
• click the coloured buttons to make the output look like i want
• save and exit
Any ideas?
I have plugged in p4merge, which I think is an excellent visual mergetool considering its free... however I have found that regardless of the settings you use such as trustExitCode, 50% of the time, it leaves all of the diff files in place, and the other 50% it does delete those temp files but still leaves the .orig file...
Can anyone help me on making concluding a merge neatly and seamlessly?
Just for added info, my process is like this:
• do a pull, and realise there is a merge conflict
• mergetool
• click the coloured buttons to make the output look like i want
• save and exit
Any ideas?
Last edited: