On 12/22/2012 3:44 PM, Jesse Phillips wrote: > On Saturday, 22 December 2012 at 21:48:51 UTC, Brad Roberts wrote: > >> I strongly recommend requiring that all bugs be first fixed in the >> development branch and then being pushed backwards >> through the version history. Quite a few projects follow this pattern based >> on the requirement that no fix can ever be >> accidentally left out of a future release. You never want someone to pick >> up (using made up version numbers) 3.4.2 to >> get a fix and later upgrade to 4.1.1 and find out it's not yet fixed in that >> release. > > Well, to have the easy merging the change must be made against the oldest > applicable code. The benefit of merging into > staging first is that staging can be merged into master, while master can not > be merged into staging. > > What is nice about making a pull request against staging is that the reviewer > knows that the fix can be applied that far > (not that comments wouldn't do the same).
I don't believe those assertions to be true. Merging in either direction is possible and the difficulty lies in the nature of the drift between the two. Neither direction is necessarily any easier than the other.
