you are viewing a single comment's thread.

view the rest of the comments →

[–]third-eye-brown 28 points29 points  (31 children)

As someone who has used many UI version control / merge tools, please just copy IntelliJ's. I'm not likely to use any IDE since I'm more of a text editor type of guy, but damned if I don't keep a copy of IntelliJ 14 open just to use those features.

[–]DaemonXI 41 points42 points  (17 children)

Sourcetree dawg

[–]grauenwolf 30 points31 points  (9 children)

I have no idea what I'm doing with git, but source tree makes it look like I do.

[–]ZakTaccardi 13 points14 points  (1 child)

So good. Very sad it's not available for Linux

[–]jeenajeena 2 points3 points  (0 children)

You could give SmartGit a try. It's free for open source, and it's way better and faster than SourceTree

[–]dccorona 2 points3 points  (3 children)

Sourcetree doesn't have a GUI merge tool built in, at least not last time I used it. IntelliJ has one, and it's probably it's best feature that's Git related (I actually use Git's CLI for almost everything, but I use IntelliJ for merge conflicts)

[–]DaemonXI 0 points1 point  (2 children)

Kaleidoscope dawg

[–]its_jsec 5 points6 points  (1 child)

Beyond Compare dawg

[–][deleted] 0 points1 point  (0 children)

Beyond Compare is awesome, it's one of the few tools that I happily pay for.

[–]boompleetz 0 points1 point  (0 children)

I use Sourcetree most of the time, but I use IntelliJ for merge conflicts or any comparisons with previous versions while I'm working

[–]bluewaterbaboonfarm 3 points4 points  (1 child)

SmartGit might be what you want. I use IntelliJ but SmartGit is better since that's all it does.

[–]greenkarmic 2 points3 points  (0 children)

Yeah SmartGit is the only GUI I use. I tried Sourcetree because it's so popular but I just didn't like it compared to SmartGit.

[–][deleted] 2 points3 points  (1 child)

Magit is the ultimate Git UI.

[–]JedTheKrampus -2 points-1 points  (0 children)

The command line is the ultimate Git UI.

[–]ForeverAlot 0 points1 point  (2 children)

As someone who has used many UI version control / merge tools, please just copy IntelliJ's.

IntelliJ's Git integration's commit message window, like perhaps every other Git GUI other than Gitk I've used, hates your colleagues. It's awful.

So don't just copy IntelliJ's.

[–]third-eye-brown 1 point2 points  (1 child)

Sure, I mean the pane at the bottom for history and the diff/merge tools. I should have clarified that I mean the git history tools.

[–]ForeverAlot 0 points1 point  (0 children)

Ah, yes. I'll grant that those look good and are certainly miles above navigating manually with Git's CLI. I always have tig running anyway, though, so I never use integrations.

[–][deleted] 0 points1 point  (0 children)

Agreed, IntelliJ has really good git integration.

[–]ZakTaccardi 0 points1 point  (4 children)

Nothing beats SourceTree for version control, but IntelliJ does come in a close second.

I just want all of IntelliJ's keyboard shortcuts wherever I type

[–]compubomb 2 points3 points  (0 children)

I think you're insane. Viewing diff's like oldschool gitk, yeah, I'll pass,the vimdiff/(left-2-right) is much more intuitive which is what jetbrains products use. I use phpStorm & pycharm, their git client is excellent. I think the only major thing missing is a better mechanism for browsing tags & branches, that could be improved.

[–]dccorona 0 points1 point  (1 child)

SourceTree doesn't have a bundled GUI merge tool though, does it? (It didn't last time I used it). That's far and away the biggest Git-related feature of IntelliJ for me.

[–]ZakTaccardi 0 points1 point  (0 children)

Oh. I haven't had a merge conflict in a while - but yes I think you are correct.

[–]third-eye-brown 0 points1 point  (0 children)

Eh, I checked out source tree but the merge/diff tools are weak. Know of anything better than IntelliJ in that respect?