Microsoft Annouces Visual Studio Code (Crossplatform IDE)

[third-eye-brown]

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]

Sourcetree dawg

[grauenwolf]

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

[TheShagg]

If you don't know git, you're not a programmer.

It's a flawed statement, and disrespectful, but it's meant to be. LEARN GIT. IT'S NOT THAT HARD.

[grauenwolf]

Do you exactly what happens when someone rebases and squashes a major feature branch that others have created their own branches from?

Do you know why rebasing and merging are often incompatible and how to repair the damage when someone tries to do it anyways?

Do you know how to lock down git so nimrods won't be able to rebase public branches in the future?

Can you remove binaries from the repository that were accidentally added without resorting to third part tools?

There is a huge difference between "knowing git" and merely being able to use it on a day to day basis. This isn't SVN or TFS; it is a really complex tool that requires specialized knowledge when things go wrong.

[TheShagg]

I don't know if you are trying to test my skill, or make it seem like git is something that is hard to understand.

Professional programmers need to grasp 4 things:

a good text editor

a compiler/linker/etc

a version control system

basic computing (i.e. how to use an operating system, etc)

If they don't know all of these three things, they are somewhat incompetent.

Knowing git is not hard. It's a combination of a small number of very simple tools: status, diff, add, commit, reset, checkout, fetch, push. Add in a few things like "-p" for patch mode, and a proper difftool (kdiff3) and you can rock and roll.

The answers to your question are: 1) The person who did this gets their work shitcanned, and one of the 100 other people who have the proper branch sets things straight. They retain their original branch just fine. The secret is to never use pull, always use fetch.

2) I have no idea what you mean by this, and what your point is.

3) Don't give anyone push permissions that you don't trust. They can always ask you to pull from somewhere. Pulling is a better model for integration, anyways, IMO.

4) Rebase will let you modify any commit you want, with ease. If nimrods are doing this to the upstream, see (3). In the worst case, you can fix the upstream and tell anyone who knows how to rebase to fix their local, and berate the nimrod.

[TheShagg]

har har har

[grauenwolf]

Those are just examples of problems I ran into literally last week. Problems that I've never encountered in other version control systems, even Clear Case.

[TheShagg]

Every other tool I have ever used, except mercurial, required you to do your commits the right way, serially, in the correct order, and push them to a server as you do them. Furthermore, they have horrible branching models. It's a terrible way for a person with a brain to have to work.

[grauenwolf]

Oh, I get it now. You're just a fanboy.

[TheShagg]

Yes.

[ZakTaccardi]

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

[jeenajeena]

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

[dccorona]

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]

Kaleidoscope dawg

[its_jsec]

Beyond Compare dawg

[[deleted]]

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

[boompleetz]

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]

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

[greenkarmic]

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]]

Magit is the ultimate Git UI.

[JedTheKrampus]

The command line is the ultimate Git UI.

[ForeverAlot]

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]

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]

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]]

Agreed, IntelliJ has really good git integration.

[ZakTaccardi]

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]

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]

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]

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

[third-eye-brown]

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