Simon, I'm surprised that you used 'git stash'/'git stash pop'. Why not use a branch and then merge it into master (possibly with rebasing)? That's what I would do. But if for some reason it is necessary to use 'git stash' then it would be good to have that reason documented in the workflow as well. Janek