Proper handling of merging between branches

[Alexander Belchenko]

I'm very like the DaggyFixes model, but it requires you to bisect the 
history to find the proper place in the past to start working on the 
bugfix. Sometimes it's not easy, especially when codebase was changed 
significantly after that, so you may try to use later point after that 
trunk and staging have diverged again.

http://monotone.ca/wiki/DaggyFixes/