Git 2.47 Released With Improvements & Encouraging More Positive Code Reviews

[uid313]

That's actually what some GUI tools (or in my case my IDE) does for me.

I wish the git CLI program did that too for me, but then that would only be one issue, there are other issues such as getting merge conflicts when I touched line 10 and someone else touched line 500.

[Tuxee]

Maybe Git could tell offer to stash my changes for me, fetch the latest commits, then unstash my changes.

That's actually what some GUI tools (or in my case my IDE) does for me.

[uid313]

Git even tells you, that you have to stash. What else do you expect? That a pull quietly eradicates your changes?.

But I have to stash it even if I created a new file or touched an existing file that the upstream didn't change so I think Git should be nice and fetch the latest commits.

Another problem I had is that I touched line 10 in a file and when I fetch I get a merge conflict even though the commit in the remote touched line 50, I think Git should be friendly and let me auto-resolve the conflict since they are on different lines.

Maybe Git could tell offer to stash my changes for me, fetch the latest commits, then unstash my changes.

Git tells you how to set your merge strategy.

I don't even know what a merge strategy is and I don't think I want to know either. Git should just pick one merge strategy as the default one so I don't have to know or care then the nerds can change it to something else if they don't like the default setting.

[Tuxee]

I accidentally started editing files in the main branch instead of my own branch and then I couldn't do a pull or fetch.

Git even tells you, that you have to stash. What else do you expect? That a pull quietly eradicates your changes?

I did a pull or fetch and it didn't work because it said I had to pick some merge strategy.

Git tells you how to set your merge strategy.

I filed a PR and the maintainer said I had to squash it. I had no idea how to squash it. One time I just said screw it and closed the PR, another time I think I managed to solve it by googling and copy and pasting a bunch of commands.

So? You RTFM (which nowadays equals to ask at stack overflow). That's pretty much the way with every software nowadays. Sometimes I even have to Google how to find certain settings on my smartphone. Apart from that the Git documentation is pretty exhaustive and well structured. You can get something like "Oh My Git!" and learn it in form of a game.

Another time something happened and I had to do some rebase or merge or something to fix a detached head or something, which I don't even know what it is, but it had tilde ~1 symbol or ^1 or something, I don't know, I had to use nano text editor to write something, I think it did undo on some commit or chose which commits to keep or it squash the commits into one, I don't know.

In what way is it Git's fault, that "you don't know"? Git is a tool build for a specific purpose, well documented, well supported. I assume you don't mess up your documents with inline styles in your word processor, because at some point you learned about "layouting" or "templates".

[uid313]

Like what? I been working with Git now for 10+ years and the command line feedback is always gonna be the "final" source of truth. However, on a daily basis I just use the Git functionality baked into my IDEs or Sublime Merge as GUI tool. I have never come across "unfixable" problems and I'd consider myself a rather "basic" git user.



It's pretty horrible. Or rather - as stated - as basic as it can get. Well, it's pretty much dead anyway.

I accidentally started editing files in the main branch instead of my own branch and then I couldn't do a pull or fetch.

I did a pull or fetch and it didn't work because it said I had to pick some merge strategy.

I filed a PR and the maintainer said I had to squash it. I had no idea how to squash it. One time I just said screw it and closed the PR, another time I think I managed to solve it by googling and copy and pasting a bunch of commands.

Another time something happened and I had to do some rebase or merge or something to fix a detached head or something, which I don't even know what it is, but it had tilde ~1 symbol or ^1 or something, I don't know, I had to use nano text editor to write something, I think it did undo on some commit or chose which commits to keep or it squash the commits into one, I don't know.

[Tuxee]

They're going to work with UX not UI so they're mostly working with Figma but also had to learn some very basic HTML and CSS.

Me myself who code in C#, Rust, JavaScript, TypeScript and Python have had lots of problems with Git too.

Like what? I been working with Git now for 10+ years and the command line feedback is always gonna be the "final" source of truth. However, on a daily basis I just use the Git functionality baked into my IDEs or Sublime Merge as GUI tool. I have never come across "unfixable" problems and I'd consider myself a rather "basic" git user.

I have never used SVN so I don't know if it is easier or more difficult than Git.

It's pretty horrible. Or rather - as stated - as basic as it can get. Well, it's pretty much dead anyway.

[uid313]

Perhaps the should pursue a different career if they can't find a proper GUI client since they will be challenged by a shell interface anyway. And as far as GUI clients go... naming 10 in 20 seconds shouldn't be a problem. OTOH: Would they be better off,if they could use, say, SVN on the command line? Ever tried that? Now that's a ...basic experience.

They're going to work with UX not UI so they're mostly working with Figma but also had to learn some very basic HTML and CSS.

Me myself who code in C#, Rust, JavaScript, TypeScript and Python have had lots of problems with Git too.

I have never used SVN so I don't know if it is easier or more difficult than Git.

[TheMightyBuzzard]

DId I say anything such as this? No. So you can pick your useless agressiveness and go calm down in some corner.

You know what's so fun about arguing with people who want everyone to blow sunshine up each others' backsides all the time? How quickly they become hypocrites the second someone disagrees with them.

[Tuxee]

Yes, I have friends who study to become UX designers and they have to use Git in their class.


Source: https://xkcd.com/1597/

Perhaps the should pursue a different career if they can't find a proper GUI client since they will be challenged by a shell interface anyway. And as far as GUI clients go... naming 10 in 20 seconds shouldn't be a problem. OTOH: Would they be better off,if they could use, say, SVN on the command line? Ever tried that? Now that's a ...basic experience.

[uid313]

Yes. Because "non-technical"guys need tools like Git... Jeez. The CLI of Git IS actually quite user friendly because whenever problems arise it gives you clear indications what went wrong and how you might be able to solve it. Besides there are about a million GUI frontends for Git. Just pick one.

Yes, I have friends who study to become UX designers and they have to use Git in their class.


Source: https://xkcd.com/1597/