Giters

JetpackDuba / Gitnuro

A FOSS Git multiplatform client for newbies and pros

Home Page:https://gitnuro.com/

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Add git-mergetool for resolving difficult merge conflicts

jammiben opened this issue · comments

commented

Add support for resolving difficult merge conflicts with an external diff/merge tool such as Meld would add power to your tool/software. It could be a prompt that the user can choose when resolving merge conflicts or have a option for enabling/disabling this feature in the settings.

I would really love this feature and I believe other power users would also.

commented

Thanks for your suggestion, seems like a useful feature to add in a near future release.

commented

Add support for resolving difficult merge conflicts with an external diff/merge tool such as Meld would add power to your tool/software. It could be a prompt that the user can choose when resolving merge conflicts or have a option for enabling/disabling this feature in the settings.

I would really love this feature and I believe other power users would also.

I second this. I use KDiff3 and the ability to continue to use my preferred software solution for difficult merge conflicts would a very welcome addition.

commented

I also use Kdiff3. I would like to switch to Gitnuro from Gittyup, but this is kind of stopping me to be able to switch.