Zheroth Posted May 28, 2015 Report Share Posted May 28, 2015 I'm using macplastic 5.4.16.666 (Barcelona) and when performing a merge with conflicting files, there doesn't appear to be an option to choose the resolution method. In the Windows client and even in the Mono client, there is an option to choose: 1) Keep source contributor , 2) Keep destination contributor or 3) Merge changes from both contributors, before processing all merges but the Mac client only gives the option to process all merges. Is it possible, in the current mac client, to choose to keep source or destination contributor before processing all merges like in the other clients? Thanks! Link to comment Share on other sites More sharing options...
calbzam Posted May 29, 2015 Report Share Posted May 29, 2015 Hi, This feature is not available yet in the new macpalstic native GUI, but we will release it ver very soon Regards, Carlos. Link to comment Share on other sites More sharing options...
JarJarThomas Posted August 19, 2015 Report Share Posted August 19, 2015 Stupid question WHAT AM I SUPPOSED TO DO ? Link to comment Share on other sites More sharing options...
manu Posted August 20, 2015 Report Share Posted August 20, 2015 Using your favorite mergetool select to keep all source (or destination) changes. Link to comment Share on other sites More sharing options...
FredM Posted August 20, 2015 Report Share Posted August 20, 2015 @JarJar I have the same situation as you but on Linux. For diff'ing I configured Plastic client to use Meld. Go in preferences, click on "Merge Tools". In the case of diff, for the type $text I simply set it as : /usr/bin/meld "@sourcefile" "@destinationfile" Should be easy to adapt this setting to use Meld as a merge tool. Fred Link to comment Share on other sites More sharing options...
FredM Posted August 20, 2015 Report Share Posted August 20, 2015 Actually I didn't manage to get meld to work properly for merge operations It'd be cool if Codice, or someone who got it right, could post the command line configuration for meld as a merge tool. Thanks in advance Fred Link to comment Share on other sites More sharing options...
manu Posted August 21, 2015 Report Share Posted August 21, 2015 Just a fast note. We are going to start implementing the "choose resolution method" for both gtkplastic and macplastic. Link to comment Share on other sites More sharing options...
manu Posted August 21, 2015 Report Share Posted August 21, 2015 And as I said you can configure kdiff3 and Ctrl+Shift+1 will choose A (base) +2 will choose B (source) +3 will choose C (destination). If you don't like kdiff3 you can always choose any other. Do it meanwhile we implement the "Choose contributor" feature, I think next will be ready. Link to comment Share on other sites More sharing options...
naris Posted August 28, 2015 Report Share Posted August 28, 2015 I am currently using diffuse http://diffuse.sourceforge.net/, as it looks much better than either kdiff3 or meld, for diff on linux and the suggested kdiff3 to merge. I have not tried using The commandline to enter into plastic's configuration screen for diff to use diffuse is: diffuse "@sourcefile" -L "@sourcesymbolic" "@destinationfile" -L "@destinationsymbolic" Link to comment Share on other sites More sharing options...
manu Posted September 14, 2015 Report Share Posted September 14, 2015 Done! Available since 5.4.16.686. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.