Hacker News new | ask | show | jobs
by lolive 1649 days ago
Am i the only one who worked on a project with multiple feature branches in parallel by different subteams, with non trivial code merge conflicts (and data model conflicts) and a upper management that constantly reshuffle the delivery dates for these features. Plus maintenance branches to support previous versions with a hotfix branch (and also backporting some newer features to older version).

That might be unusual, but even GitFlow in that case is very poor handling those kind of deliveries.