DRAFT. Better methods from better minds invited!
Situation: Someone has been working away wonderfully on a git branch on your project. You do some crazy stuff with it over the weekend, and when they, on their continnum branch, go git pull --rebase origin continuum and get conflicts they don't know how to deal with, or when they go git fetch origin and git rebase master and have conflicts.
You want to take this off their hands.
Except where otherwise noted, content on this site is licensed under a Creative Commons Attribution 3.0 Unported License.