DEV Community

Discussion on: What is your favourite git merge tool/strategy?

Collapse
 
sadarshannaiynar profile image
Adarsh • Edited

Check out Gitkraken it's a good GUI tool build for git. They support most of the git features and also make the merging and rebasing process very easy.

Collapse
 
flexdinesh profile image
Dinesh Pandiyan • Edited

GitKraken is good as long as you only do reads (checkout and diff) and not writes (commits and rebase) 'coz they don't support local config or multiple config in their community edition which is kind of a bummer.

Collapse
 
jrock2004 profile image
John Costanzo

Some time ago I used that tool. But when they switched their TOC to having to pay for it for non open source stuff, I left it

Collapse
 
thebouv profile image
Anthony Bouvier

Same, and it started requiring an account be set up. For the desktop app. No thanks.

Collapse
 
twigman08 profile image
Chad Smith

I used to be a big fan of GitKraken, though on larger repositories it seem to just slow down to a crawl for me. It would just take forever for them to open. Sometimes spin forever.

I also tried to use with git LFS enabled and kept having issues with it sadly.