News for hackers. Stuff that matters.
Re:GitFlow considered harmful by sytse on Friday June 19, 2015 @12:56PM (#9746093)
Parent was deleted.
Re:GitFlow considered harmful by Mithaldu on Friday June 19, 2015 @01:35PM (#9746375)
Ugh dammit. Short version:

Instead of taking the branch <feature> and rebasing it, make a branch called <feature>.1 on top of <feature>, then rebase that, leaving <feature> in place.

That way all your references remain intact and you can compare CI results.

Increment the number as needed.

Re:GitFlow considered harmful by sytse on Monday June 22, 2015 @07:32AM (#9757553)
It solves the issue of the CI references. But it also seems a bit clumsy to me.
Re:GitFlow considered harmful by Mithaldu on Monday June 22, 2015 @04:02PM (#9760825)
It's all trade-offs. The trade-off being that you maintain history by having copies of a branch around, while the dude trying to fix a bug doesn't have to break out the vodka bottle upon arriving back home. :)