Some very good advice given to me before OPW was to split my work on each bug into a separate local branch on git.
If I had to make a flow chart, it’d probably look something like this:
The most important thing to remember, though, is to always use
$ git checkout <branch-name> when you are on master.
In other words, your new branch should always be a clone of the latest master branch to minimise the number of merge conflicts that can occur when you cherry-pick your commits back to master.