you 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.
Die Git Die
31–40 of 100 posts
Re: Die Git Die
#32Re: Die Git Die
#33Whenever I'm pulling down code, instead of `git pull', I use fetch. I fetch the specific branch into the local remote tracking branch (remote/branchname). Then use rebase, rather than merge. I won't lose anything and it avoids those dumb merge commits. Also, aliases are great for this. git fetch :refs/remotes/ / git rebase /
That's equivalent to just doing `git pull --rebase`, no?
Re: Die Git Die
#34you 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.
Git user interface is fine when you finally learn how to use git.
Re: Die Git Die
#35"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!
You say that, but the next version of Visual Studio's gonna have git built in. Seriously. Gonna be a lot of new (and probably confused) users out there.
Re: Die Git Die
#36I totally agree that this is surprising behavior. But git did try to tell you: ! [rejected] master -> master (non-fast-forward) And once you've invoked the gods of `push -f`, you're on your own.
Re: Die Git Die
#37Github is the one who wants you to use git. This is why github built you a gui.
Re: Die Git Die
#38This is why git-up was created: https://github.com/aanand/git-up
It's silly that this is necessary, but "gem install git-up" and then run "git up" instead of "git pull" and you'll be much happier.
Re: Die Git Die
#39Git has a lot of UI problems. This is not really surprising. It's gotten a lot better, but I do think that no matter how proud Torvalds is of the fact that he never looked at another version control system for inspiration, a lot of pain could have been avoided if he had (even while still going in the different directions he did). Not all of us had the 'luxury' of never working with version control before. But don't g…
If I could change one thing, it would be pushing and pulling between workstations and central repositories. Distributed is nice, but at the end of the day you still want your code to end up somewhere, and Git doesn't make that process feel smooth or robust.
Re: Die Git Die
#40Earlier quoted context omitted.
That's equivalent to just doing `git pull --rebase`, no?
`git pull --rebase` does not update my remote tracking branch. Though you may not care about this.