Some engineers have expressed difficulty using the GUI: “This tool has been slow and buggy (even on small merges), often complaining of multiple merge operations happening simultaneously and not responding to user input in the gui. Failures seem to require restarting the merge from scratch.”
Is there an option to resolve conflicts in a text editor, rather than stepping through each line individually in the Plastic app merge tool? Could we have the merge routine leave a marker in the code where a merge conflict was detected similar to git?
It’s not as straightforward as having git-like merge markers, but as a temp workaround you could install an external 3-way merge tool and configure the client to use that tool instead of the builtin one.
I personally use and can recommend Beyond Compare, it’s not free but it is the best merge tool I’ve used.
oh that’s a great idea! Thanks for the recommendation 
Yes, you can configure your favorite external mege tool. I may be biased but I much better prefer the Plastic way to resolve the conflicts via the external merge tool. Also, it includes Semantic Merge technology that helps to resolve many conflicts.
If you close the Plastic external merge tool for some reason, you can re-run the merge and continue it at the same point it was, you don’t need to restart the merge from scratch if some conflicts were already solved.