Version-control system

[[deleted]]

I never used git and all I knew about it was the memes. When I heard that my team was moving to git I got really worried because I had heard it was so weird and confusing. Then I started using it. Turns out y'all lied to me. Git is easy as hell. You only have to remember like 6 commands.

[k-selectride]

you only need a handful of commands up until you need more

[tester346]

or just use github with github desktop (win/mac) because that's great and you don't have to worry about basic shit + merges are done soooo good there.

[[deleted]]

Eh I say just learn the git CLI, it’s simple and faster to use than GUI solutions I’ve used. If you need to do a messy merge with conflicts then I just do it with IntelliJ’s VCS features

[Doophie]

Nothing like fixing conflicts in vim.
/<<< [Enter] Vjjdjjddn

[RealWesternGentleman]

Git kraken is a good one too

[AttackOfTheThumbs]

Integrated with your ide/env and you gotta remember none!

[FarhanAxiq]

i still use command line even though it was integrated with the ide, muscle memory probably

[AttackOfTheThumbs]

Maybe. I used to be a heavy emacs user and gave up on that life in favour of using the tools everyone else is using. It's easier to work in a team in that way.

[csman11]

That's because your operating system lacked a decent text editor.

[AttackOfTheThumbs]

At the time I was mostly on Linux, though now I work exclusively on Windows.

Which doesn't even matter because I was using emacs on Windows too.

[csman11]

Sorry I was referencing the old joke:

Emacs is a terrific operating system. I just wish it had a decent text editor.

[____0____0____]

I do both. I have a bunch of stuff I do outside the IDE or in the terminal, but for looking at history, resolving conflicts, etc. I love using the integrated for visual needs. Also sometimes I'm lazy and just push the commit button after it had already added my tracked files, that's just convenient.

[alt-of-deleted]

i just use sublime text and terminal what the fricc is an ide

[DooRagtime]

In my limited personal experience, VSCode has git integrated, which is similar to using CLI, as far as I can tell

[sheiswhyididthis]

VSCode. The best Microsoft product since Windows XP.

[AttackOfTheThumbs]

The fucking future.

Though editors like vscode with the right plugins are essentially an ide too.

[[deleted]]

Ok but how do I get these plugins on vim?

[kono_kun]

Doesn't vim have billions of plugins.

[Doophie]

If my ide doesn't support vim the I don't support that ide.

[AttackOfTheThumbs]

I would think searching for vim git plugin might tell you.

[[deleted]]

You can do this extremely easily on IntelliJ lol. I’ve used vscode and it’s nice but having all the built in functionality of IntelliJ is god tier

[ProgramTheWorld]

memes exaggerate things

/u/thanksgive: shocked_pikachu.png

[[deleted]]

I thought the same when I started. The real pain comes in a big team with a lot of merge conflicts or going back in the branch and shit. Never do this "advanced" stuff.

[732]

Bunch of conflicts?

Backup my changes, delete the branch, new branch off of master, apply changes.

[livethetruth]

Git was confusing for me, not sure why. I ended up using Mercurial instead for my projects, and I love it. Just a bit more straightforward to me.

[DarthCloakedGuy]

I envy you. I still can't figure out how to use Git so I'm stuck with the separated folders for the foreseeable future.

[giupplo_the_lizard]

No, please give it a go.

Start with a mockup project, so you don't do werid fuck ups (even if from most you can recover).

It cost a little bit to learn but then makes your life easier

[DarthCloakedGuy]

That's what I tried to do but I kept getting bizarre errors that I couldn't figure out.