--force-with-lease as a default is a really bad idea. Copying random aliases is a bad idea.
--force-with-lease as a default is a really bad idea. Copying random aliases is a bad idea.
Saying "the tool is great, users just need to RTFM" sounds an awful lot like "you're holding it wrong".
While I agree that git's UI could be made less cumbersome in some cases, many people in this industry want to use sophisticated tooling without doing due diligence such as reading a manual. Handling code versioning in a distributed manner is not an easy task!
I don't expect much from junior developers, but if I have to fix trivial git problems from more "senior" developers, I will have some disdain for them.
not familiar with what you're referring to... can you elaborate?
In short, every commit can be in one of three phases, secret, draft, and public. Commits transition to public when you push them somewhere someone else might depend on them, and rebase won’t allow you to rebase any public commits.
Commits can of course be manually transitioned back as a “I know what I’m doing step” but this provides a lot of safety for casual rebases.
(Secret just prevents the commit from being accidentally pushed)
When I interrogate users who aren't grokking git, it's not really git's UX that's the problem, it's far more fundamental: like not understanding (and thus not being able to conceptualize and visualize) that the commit graph is a DAG. Not understanding what "rebase" is, because they have no concept of what the word "base" means: rebase follows trivially from that understanding, if they had it.
CLI git has these presentations; it can present the commit graph, though oftentimes companies do such a crap jobs of approaching git history that git is left to render spaghetti. UI tools exist, but face the same spaghetti in, spaghetti out. It's like asking your IDE to make bad code less bad. Worse is people actively promulgate broken "methodologies" that result in these spaghetti graphs, such as the ironically named "A Successful Git Branching Model".
Did you know you can use `git fetch origin master:master` to update an un-checked out local branch? Go find where that's documented: https://git-scm.com/docs/git-fetch
Spoiler, here's all you get:
> The format of a <refspec> parameter is an optional plus +, followed by the source <src>, followed by a colon :, followed by the destination ref <dst>. The colon can be omitted when <dst> is empty. <src> is typically a ref, but it can also be a fully spelled hex object name.
Just a truckload of jargon. There's thankfully one code sample to give context, but it's at the bottom of the page – nearly 7,000 pixels of scrolling away from the description of it.
The problem is that the inconsistency means that you need to constantly refer back to the manual until you have a huge amount of arcana memorized.
Not only that, but it's not always easy to find what you're looking for in the manual.
Yes, programmers should all at some point read the first few chapters of Pro Git, and at least skim through the "internals" chapter.
But idiot-proofing goes beyond babying people who don't want to read docs. Even people who do read docs and care a lot about learning their tools make mistakes and forget things occasionally.
> --force-with-lease as a default is a really bad idea.
Agreed.
> Copying random aliases is a bad idea.
Agreed, but looking at other people's aliases to get ideas and borrow useful snippets is a great idea.
I made a list of other version control systems I've used in the past and out of the 7, I can only remember one that was complicated enough from an end user perspective to require reading a manual(ClearCase).