Merging vs stashing
What are your thoughts on merging versus stashing/rebasing? Simon Owen, Manchester, UK EJW: Do whatever works for your team. Need a very clean history? Use rebase to update branches and merge --ff-only to incorporate contributor work. Need to cater to novice contributors? Allow branches to be updated via merge (no one will die. I tried it once for science). If you want to do The Right Thing, I’ve created a flow chart to help you decide (see above).