The absolute worst situation I've gotten into was just the other day, when my team managed to check in two files with the same name, but different capitalization. The server (Bitbucket) is Linux-based, but all the workstations are Mac or PC, so the names collided on everyone's desktops. This prevented anyone from pulling or checking out a different branch, so even after master was fixed, everyone's environment stayed broken until someone figured out the right magic incantation (git rm --cached).
Oh shit, git: Getting myself out of bad situations
381–390 of 520 posts
Re: Oh shit, git: Getting myself out of bad situations
#382Earlier quoted context omitted.
This is simply untrue: " The issue you have with git, is that untrained developers have a hard time using it. " Please re-read my first post, up above, which started this thread. I wrote: " But all of that stuff is trivial compared to the major flaw: Graphic designers, writers, HTML/CSS frontenders, managers, data analysts and QA staff can’t use Git, even though they all used Subversion. "
Ok, I agree, attacked your weakest argument, which you specifically marked as being trivial flaws. So to address your actual issue: > Graphic designers, writers, HTML/CSS frontenders, managers, data analysts and QA staff can’t use Git, even though they all used Subversion. Why is it hard for them to use git? For simple use cases, git can be as easy as commit & push. No need for branches. There are even UIs which allo…
"Why is it hard for them to use git? "
All I can do is quote what you wrote in a different comment:
"If you're an artist, git is not for you."
Re: Oh shit, git: Getting myself out of bad situations
#383Earlier quoted context omitted.
Create a feature branch, revert the revert, and then fix the problem. It sounds a little weird but it works fine.
It’s a lot of paperwork to avoid a perfectly safe and normal git command.
To be fair, rebasing a shared branch really isn't all that safe. You can potentially make life hard for a lot of people.
Re: Oh shit, git: Getting myself out of bad situations
#384Earlier quoted context omitted.
It's not anything inherent to a visual UI though, it's just that most of the UIs that exist are trying to put their own model on top of git, rather than embracing git's model. The one exception to this I've found is GitUp (mac only, sadly), and it's excellent. It's whole model is, "what operations can I perform on this graph," which is exactly the model git has. It's great.
SourceTree keeps the same language regular git uses. But I highly agree. JetBrains IDEs add their own lingo out of support for multiple version control plugins I'm sure but its confusing and easy to screw up. SourceTree is the one GUI client I want on Linux...
VSCode is the only Git GUI that you need and it's available on Linux
Re: Oh shit, git: Getting myself out of bad situations
#385Haha. There should be an entry there for 'Oh shit - I just pushed our private keys to the public github repo'.
Re: Oh shit, git: Getting myself out of bad situations
#386Adopted a git GUI years ago and haven't looked back. I get looks sometimes, but I can't help but gloat when I can stage and unstage individual lines in less than a second. I think anyone who uses the CLI is either trying too hard or hasn't realized the beauty of a git GUI. Takeaways: - My commit time is usually much faster than coworkers, with higher accuracy (less frequent accidental commits, etc.) - I don't remembe…
I've tried out a few different GIT GUIs, and never really took to any of them. Settled for using the CLI + many BASH aliases. Anything I do frequently gets a concise alias to minimize typing. I have relatively short fingers, and I'm admittedly a pretty poor typist, so I really emphasize the concise part. Pretty much all the aliases are write only code. I do this for pretty much every other complex CLI application too, e.g., Docker, Heroku, AWS. A little abstraction really speeds up using the CLI. Aliases are my favorite feature of BASH, I think they've saved me literally months of typing at this point in my life.
Here's a few handy ones:
alias currentbranch='git rev-parse --abbrev-ref HEAD'
alias gpush='git push origin $(currentbranch)'
alias gsync='git pull origin $(currentbranch)'
alias ga='git add -A'
alias gc='git checkout'
alias gcm='git commit -m'
alias gca='git commit --amend'
# and my personal favorite (list recent branches)
alias gb='git for-each-ref --sort=-committerdate refs/heads/ --format="%(HEAD) %(color:yellow)%(refname:short)%(color:reset)" | head -n 20'Re: Oh shit, git: Getting myself out of bad situations
#387For me the big thing was learning to 1/ not work on master unless I’m alone and 2/ commit all my work incrementally
git pull —-rebase
git log
git rebase -i HEAD~n
Re: Oh shit, git: Getting myself out of bad situations
#388Earlier quoted context omitted.
SourceTree keeps the same language regular git uses. But I highly agree. JetBrains IDEs add their own lingo out of support for multiple version control plugins I'm sure but its confusing and easy to screw up. SourceTree is the one GUI client I want on Linux...
VSCode is the only Git GUI that you need and it's available on Linux
Do you use it? I have it enabled, but when I tried to revert a few lines (which should be the simplest operation ever - NetBeans did it perfectly; may it rest in peace...) I got some horrific message that made me doubt what the operation will do. So I haven't gathered enough courage to try committing anything... With CLI at least I know what I did wrong.
Re: Oh shit, git: Getting myself out of bad situations
#389“Git gets easier once you get the basic idea that branches are homeomorphic endofunctors mapping submanifolds of a Hilbert space.”
— Isaac Wolkerstorfer (@agnoster)
Re: Oh shit, git: Getting myself out of bad situations
#390Adopted a git GUI years ago and haven't looked back. I get looks sometimes, but I can't help but gloat when I can stage and unstage individual lines in less than a second. I think anyone who uses the CLI is either trying too hard or hasn't realized the beauty of a git GUI. Takeaways: - My commit time is usually much faster than coworkers, with higher accuracy (less frequent accidental commits, etc.) - I don't remembe…
I've tried out a few different GIT GUIs, and never really took to any of them. Settled for using the CLI + many BASH aliases. Anything I do frequently gets a concise alias to minimize typing. I have relatively short fingers, and I'm admittedly a pretty poor typist, so I really emphasize the concise part. Pretty much all the aliases are write only code. I do this for pretty much every other complex CLI application too…
My version of gsync is `git pull --rebase origin ${currentbranch}`, since I hate having random merge commits.