Ranter
Join devRant
Do all the things like
				++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
				Sign Up
			Pipeless API
				From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
				Learn More
			Comments
		- 
				
				Used to use gitkraken until it gave me the finger with non-paid limitations
and now - git-scm - 
				
				@netikras Yeah. That's why I switched to SmartGit. The merge tool is bad. Instead I use the vs-code merge tool.
 - 
				
				VaderNT14575yGitKraken until their limitations stunt. Tower on Windows until their even worse "mandatory update and now it's paid only lol" stunt. Seriously, fuck Tower. SourceTree is bearable.
Nowadays IntelliJ's built-in Git client and the original CLI + kdiff3 occasionally. IntelliJ knows how to merge correctly. It's almost magical. - 
				
				90% of the time -> cli
10% of the time... when really lazy... -> vscode... don’t judge me! - 
				
				Tr33265ysimple things like checkout, pull, push through cli. Everything else like, merge, squash, commit through Intellij
 - 
				
				cli on linux fir simple stuff. sublime merge for merge conflicts and rebase, times when I need to see the log graph or need to resolve diffs. On windows I used GitExtension but if I were to code on windows I might go with sublime too because I can script and configure the hell out of it.
 - 
				
				Command line, mostly.
But I prefer a GUI for adding files and handling merges. vsCode does the job.
I’ve occasionally used gitKraken to peek at stashes. - 
				
				CLI for anything but merges that are larger than 4 files. Then I just open in any editor.
 
Related Rants

Which is the git client you use at your work?
question
git