Survived a year on add/commit/push. Finally learned rebase and it wasn't the monster I feared — CareerVerse