Should we use integration branches?

[Bjwebb]

We discussed on the train to Berlin how to deal with the fact that merge conflicts may happen in future. My main suggestion was rebase a lot, but, looks like having an integration branch, and using git rerere may also be a useful approach.

https://github.com/affinitybridge/git-bpf/wiki/Branch-per-feature-process#the-integration-branch
http://git-scm.com/2010/03/08/rerere.html