Quote:
Originally Posted by ixtab
I repeatedly got errors while trying to commit on "master" which said something about fast-forward, and I figured I needed to "git checkout js-tool; git pull; git checkout master" to get it working again. While this worked, I still don't know WHY it worked.
Can someone make this clearer, or is there a "git for idiots" page somewhere?
|
I have the same errors about master branch (as I'm working on js-tool branch).
Relax, there are no reasons to worry (for this concrete case with js-tool branch). Your solution is valid. You could also just skip these error messages about non-forward to other branch, if you didn't made any commits to it (as I do). If you want to push only
master branch you should do
git push origin master.
Honestly, I am understanding it no so much too
I can suggest
http://progit.org/ book (especially
http://progit.org/book/ch9-0.html which is describing internals of Git pretty well and easy to read. And internals of Git are simple and awesome).