I’m getting better and more confident with git. It’s easier to figure out what to do without messing up master. Whenever a conflict creeps up, I usually just branch out and reset the previous branch so my old work is safe. Or rebase commits.
Better still, as Kat suggested, I sometimes create branches for each bug.
Accidentally commit on master, when you were actually supposed to be working on a branch? Just cherry pick the commit onto the branch and git reset –hard origin/master.
TODO: Find some new bugs to work on. 🙂