benjohn, 2 months ago @b0rk This is a really great question. I have git mergetool set up to use p4, but I never know which side is which. I always work it out based on the bits it is asking me to resolve and what I can remember of what I did and what other people have done (or I've done elsewhere). But this doesn't feel easy!
@b0rk This is a really great question.
I have git mergetool set up to use p4, but I never know which side is which. I always work it out based on the bits it is asking me to resolve and what I can remember of what I did and what other people have done (or I've done elsewhere).
git mergetool
p4
But this doesn't feel easy!