26 Dec
2013
26 Dec
'13
2:41 p.m.
On 26 December 2013 12:03, Cox, Michael
I'm not sure I follow the part about the nits. As far as hot fixes go (or any type of topic branch for that matter), the same process is followed:
1. The developer continually rebases other peoples changes onto the topic branch while working on the changes to implement the hotfix, feature, etc. 2. The topic branch cleanly builds and passes all tests. 3. Optionally the developer interactively rebases to structure the commits to a small number of logical commits, or if that's not important, --squash merges it into develop
We have a lot of git novices here, getting them to continually rebase branches is probably a bad idea.