Re: git workflow - merging upwards

2012-08-17 Thread Patrick Sabin
Thanks, for the great answer. What I am still concerned about is that in my project I plan to make bigger structural changes (let's say in 1.2) while still developing in the older branch (let's say 1.1 with the old structure. I expect that there will be many changes which I think that they can't b

Re: git workflow - merging upwards

2012-08-16 Thread Junio C Hamano
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 integration branches upwards into > each other." > > This looks great but I

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