Git Fubar
Knowing how to get your own commit(s) to be fast-forward off a target branch, to not be afraid or feel out of control when using Git, is part of being an effective engineer, whether in a team of 1 or 1000.
Getting started
This site isn’t really designed to be taken in all at once; just as you wouldn’t expect to take in all of how Git works in a single sitting. Click around the site navigation and let your curiosity take you down a rabbit hole. Or, especially if you’re really new to Git, you might be interested in:
More about Git
It’s ok to force-push! Rebasing is usually preferable to merging! You can
compare the lists of commits in two or more branches using git show-branch
. You can
reorder commits! git pull
(by default) is not your friend!! Commits are
immutable! Branches are cheap and you can use them for all sorts of
stuff.
Have fun!
– Gabe