Gitkraken diff how to#
Gitkraken diff update#

Integrations are great, but it doesn’t feel worth juggling PAT’s to make it work. Gitkraken is leaning into some distinguishing features like it’s Terminal, Workspaces, and other integrations which is nice BUT I don’t care as much about that as I do some other things like:įork is massively almost overwhelmingly superior in both of these aspects. The UI differences are there but they’re not significant, and yet I feel like Gitkraken is a bit nicer. That sounds like the correct behaviour, but recently in Fork I ticked “Remove stash after applying” and moved on, but it was remembered the next time which I didn’t want. Perhaps it’s the fact that the defaults and flows mean I get less prompts, and if I set something that ISN’T a default, it’s NOT remembered. It’s defaults fit my workflow quite well, and SOMETHING about it just feels a bit nicer.

Reading all the above “facts”, it feels like I’m leaning towards Gitkraken, and to some extent I am. Sometimes it doesn’t matter what the tool does, it’s more about how it feels. Has a custom terminal with additional git features.Has it’s own Workspaces feature allowing a custom board and whatnot for teams, etc.They both have similar features, although I’d say Gitkrakens is slightly better, better syntax highlighting, better support for entire file view, etc. Inlines branch/tag with commit message, shows SHA and commit timeīranch/tag pulls out to left, hides commit time a little Single button, rebase by default (I think)įails with Git output, needed to tick box in modal Yearly subscription instead of one-off payment.Nice defaults and helpful suggestions (do you want to force push?).If KDiff3 works for you, then I guess you’re lucky and you can use that for the time being.

Gitkraken diff update#

So it seems that you will have to wait until a future update for GitKraken to support meld or other merge tools (I also tested Beyond Compare on my machine). I had to look at a cached version from Google to see that) (For some reason, the Disqus plugin on that blog is not loading correctly right now, so you cannot see those comments. There is a known issue with not being able to find the mergetool set and this will be addressed in an upcoming update! In a comment to one of Axosoft’s blog posts about GitKraken, this was discussed:Īny news when using a mergetool works? Is this yet missing or just bugged? I've configured a working mergetool in git global and it works calling it from console but gitkraken just does nothing when clicking 'open in mergetool', not even an error message. It seems that as of right now, GitKraken does not fully support all merge tools configured with git-config right now.

Gitkraken diff how to#

I'm not really sure what I did and how to make it work. Path = C:\Program files (x86)\Meld\Meld.exe gitconfig file looks like this: Įxcludesfile = C:\Users\\Documents\gitignore_global.txt I installed Meld for using it with GitKraken, and after that I tried to follow these steps to make it usable within GitKraken's interface, but GitKraken's merge tool choice options haven't changed.Īfter running a few commands from those steps and some others trying to make it work my. 'Git Config Default' option was selected there and I could only choose 'None' or 'Git Config Default' options. Since I haven't configured a Merge tool, I head over GitKraken's preferences and checked out the 'Merge tool' section. When the program sees a conflict it shows up a button which says 'Open in merge tool'. I downloaded GitKraken for working with Git repositories and it works great for everything I need, but I haven't been able to configure it to use a merge tool like WinMerge or Meld.