Re: git workflow - merging upwards

2012-08-17 Thread Patrick Sabin
Junio C Hamano wrote: > Patrick Sabin writes: > >> I read through gitworkflows and want to use the Merge Upwards rule in >> my projects: >> >> "Always commit your fixes to the oldest supported branch that require >> them. Then (periodically) merge the inte

git workflow - merging upwards

2012-08-16 Thread Patrick Sabin
I read through gitworkflows and want to use the Merge Upwards rule in my projects: "Always commit your fixes to the oldest supported branch that require them. Then (periodically) merge the integration branches upwards into each other." This looks great but I have some trouble in the case if