News for hackers. Stuff that matters.
Re:git cascade and git forward-merge by salgernon on Tuesday April 01, 2014 @11:25AM (#7508946)
>> If we find bugs during pre-release testing, we fix them on release, then immediately merge release back on to master

As a self diagnosed Aspie, I can't tell if this article or your comment are April 1st jokes. Which I guess is kind of the point of April 1st jokes.

Re:git cascade and git forward-merge by gcr on Tuesday April 01, 2014 @11:56AM (#7509223)
Meh. That seems sensible to me, I guess, if it's something that the developer will guarantee won't change anything (eg. a typo in a translated string). I think "automatically" generated commits like this should clearly be marked as such so if something does go wrong, it's possible to place the blame.
Re:git cascade and git forward-merge by salgernon on Tuesday April 01, 2014 @01:19PM (#7509941)
Back in days of yore, we decided to ship and updated the copyright string in the .text section of the product binary - from "Copyright 1989 SMI" to "Copyright 1991, Sun Microsystems", which subsequently changed the alignment of other sections and led to a 10% performance penalty (fixed by regenerating the order file.)

I've never thought there was such a thing as safe fix ever since...