I’m trying to use the Merge tool but it doesn’t work. Me and some people started a new project and we are using perforce and we want to know how to use the merge tool when we get conflicts.
I’m not sure if I’m using it correct or not, but I guess the first two boxes are those two you want to merge and the last one is how it’s going to be when you are merging and saving. Right now I’m trying it local, not with perforce, and it doesn’t work for me. It should be good if it was any tutorial or document how to use it.
I would be grateful if someone could help me