wheatus Posted January 10, 2020 Report Share Posted January 10, 2020 Hi, Is there possibility to remove window with basefile from gtkmergetool on ubuntu? I've tried to remove -b="@basefile" bn="@basesymbolic" -bh="@basehash" but when window is going to run then error occurs. Link to comment Share on other sites More sharing options...
calbzam Posted January 10, 2020 Report Share Posted January 10, 2020 Why do you want to remove the basefile? Every merge has three contributors, so it makes sense if you need to manually solve a merge to check the three contributors (not hiding any of them). Regards, Carlos. Link to comment Share on other sites More sharing options...
wheatus Posted January 22, 2020 Author Report Share Posted January 22, 2020 Thank you for the reply Carlos. In most cases I don't use basefile. (I don't remember situation when I choose something from basefile) Sometimes when I'm trying to merge there is annoying mess at he bottom window. It's hard to choose correct piece of code. If I have only source and destination it would be much easier to choose appropriate code. Link to comment Share on other sites More sharing options...
calbzam Posted January 22, 2020 Report Share Posted January 22, 2020 If we don't use the base contributor all the merges will be manual (not automatic merges). In the following guide we explain the advantages of 3 way merge (source, base and destination) vs 2 way merge (source and destination): https://www.plasticscm.com/documentation/advanced-version-control-guide Regards, Carlos. Link to comment Share on other sites More sharing options...
wheatus Posted January 22, 2020 Author Report Share Posted January 22, 2020 I understand but this view is very annoying not only for me but also for the rest of my team. Especially this bottom window where we see all 3 pieces of code and additionally background colors are almost undifferentiated Link to comment Share on other sites More sharing options...
calbzam Posted January 22, 2020 Report Share Posted January 22, 2020 Plastic allows to configure your favorite external merge tool: Kdiff3,... You can if in the "Prefereces" panel --> "Merge tools". In the following link we explain the features of our built-in text diff and 3-way merge tool. Your feedback is welcome: https://www.plasticscm.com/features/xmerge Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now