Xorcist Posted September 22, 2015 Report Share Posted September 22, 2015 Is there anyway to tell Plastic's Merge Tool to just take the Source, Base, or Destination files without cycling through each and every conflict and handpicking the appropriate file? I ask because we recently ran into this issue, and knew for a fact we wanted only the source files, but I couldn't find a way to do with within the merge tool. And there we're like 100+ conflicts, so handpicking the source file for each conflict was very time consuming. There has to be a better way... maybe I'm just missing something. Link to comment Share on other sites More sharing options...
manu Posted September 23, 2015 Report Share Posted September 23, 2015 Hi! Yes, for windows you can select all the conflicts and choose a common resolution at once. It will be ready for GTKPlastic and MacPlastic soon. Using the command line you can use the --keepdestination and --keepsource parameter. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.