Hi all,
I have what might be a slightly unique situation. We’re 3 people working on a project and have 3 relatively wildly differing branches in git with some pretty massive merge conflicts that for some reason Git simply refuses to merge (giving errors every time).
My question is, if I on my side want to pull these 3 different branches from Git, convert the project to plastic and merge them in plastic (which appears to have a easier to work with merging engine), how would I go about doing this? I tested it a bit, by pulling one branch in Git, saving that workspace as a branch in Plastic, and then deleting the directory and pulling the next branch and saving that as a seperate branch in Plastic. But then when I try to merge those two it’s showing 0 conflicts (which should be impossible), and then entering the project shows that clearly no merge took place.
Am I missing something?