Die Git Die
github.com
Die Git Die
1–10 of 100 posts
Re: Die Git Die
#2I am so glad someone wrote this up and shares my frustration.
I've been through this exact battle so many times, git pull should only ask you for your branch if you've told it you want it to (as a safety measure i guess)/
Re: Die Git Die
#3you need to read "Git for dummies"
Re: Die Git Die
#4[deleted]
Re: Die Git Die
#5I totally agree that this is surprising behavior. But git did try to tell you:
! [rejected] master -> master (non-fast-forward)
Re: Die Git Die
#6> $ git push origin gh-pages
I think that if you had changed the above to
$ git push -u origin gh-pages
Re: Die Git Die
#7"The git, the?"
But seriously, yes, you have to learn how to use Git in order to use Git. But you don't have to use Git. Click here to renew your Visual Source Safe license, or better, just copy your file to file.1 every time you edit it. No way that can go wrong!
Re: Die Git Die
#8I don't know why, but I always end up telling every single person who either 1) Bitches about git, or 2) asks for help, that I always, always, always tell "git push" or "git pull" which remote and branch.
It's muscle memory and makes everything more explicit and easy to understand. Although, in this case, it sounds like you expect git to be intuitive. (Which it is not)
So this basically amounts to a blog post complaining that git is hard.
Re: Die Git Die
#9you need to read "Git for dummies"
git has no user interface. git expects its users to have an in depth understanding of its implementation details. These are failures of git. Ideally, studying abstruse man pages to avert disaster wouldn't be required of new users.
Re: Die Git Die
#10> $ git push origin gh-pages I think that if you had changed the above to $ git push -u origin gh-pages then everything else would have gone smoothly.
This is what I do personally. We also use rebases liberally at my office which requires us to force push upstream. On-boarding new team members scares the shit out of me.