On Thu, Dec 15, 2016 at 08:14:58PM +0000, Larry Minton wrote: > My question: > > Let's say I have a code change that I want to 'bake' for a while > locally, just to make sure some edge case doesn't pop up while I am > working on other things. Is there any practical way of doing that? I > could constantly merge that 'bake me' branch into other branches as I > work on them and then remove those changes from the branches before > sending them out for code review, but sooner or later pretty much > guaranteed to screw that up.... I wrote a tool [1] a while ago to manage integration branches so I use a personal integration branch to pull together various in-progress branches. It means you can keep each topic in its own branch but work/test on top of a unified branch by running: git integration --rebuild my-integration-branch whenever you change one of the topic branches. I also use the instruction sheet to keep track of abandoned topics that I might want to go back to but which are currently in a broken state, you can see an example of that in my CGit integration branch [2]. [1] http://johnkeeping.github.io/git-integration/ [2] https://github.com/johnkeeping/cgit/blob/d01ce31ed3dfa9b05ef971464da2af5b9d6f2756/GIT-INTEGRATION-INSN