News for hackers. Stuff that matters.
Re:GitFlow considered harmful by Mithaldu on Friday June 19, 2015 @11:01AM (#9745224)
> I think the majority of people on our team don't like rebasing because it makes spelunking harder in some cases.

Would you elaborate on that please? I don't know what your situation is like that would cause rebasing to make spelunking harder.

> reverting a merge is possible but harder

Funny, someone else further down claimed reverting merges is easier. :)

Re:GitFlow considered harmful by sytse on Friday June 19, 2015 @11:18AM (#9745354)
Because you rewrote history it is harder to see what was written, tested by hand and tested with CI at what time.
Re:GitFlow considered harmful by Mithaldu on Friday June 19, 2015 @11:21AM (#9745374)
Another social issue. In the projects i work with, it is commonly agreed upon and known that of course after a rebase every commit needs to be retested and reverified with CI. It is a bit of extra work, but as i mentioned in another commit: We do that extra bit of work now, to avoid having to analyze the cross-talk of a bunch of branch merges at a later point; mainly because that bit of later work often turns out to be considerably bigger. (Technical debt is a talking point here.)

Of course, this might be unviable when under unusual time pressures.