Comment by pyrolistical

Perforce was fine. It just had a terrible ui and didn’t allow me to code on the beach.

If I were still manually merging conflicts the p4merge tool was GOAT

I used it in git