4 ms·
The long-lived feature branch "pros" made me shiver. I hope I never work in an environment like that again
by willsmith72 3y ago
The long-lived feature branch "pros" made me shiver. I hope I never work in an environment like that again
- senfiaj 3y agoYap, the merge issue is one of the worst nightmares for developers.
- hinkley 3y agoIf you don't master your fear, then your fear will master you. - The Sphinx
- senfiaj 3y agoThis doesn't mean you should look for a trouble and not prevent potential problems with better coordination / planning and carefully weighting the pros / cons of a particular decision. Merge conflicts and huge refactorings can sometimes have nasty consequences in a form of huge release delays, bugs and inconstancies surviving for months and even years after the "stable" release. Would you be happy if someone asked you to merge 3 long lived branches, the first one being a complete UI redesign, the second one complete UI translation and the third one - complete refactoring? Maybe I am exaggerating but sometimes I have experienced things that were not very far from that.
- hinkley 3y agoCI/CD says it does. Look for troubles when they're small and manageable, instead of when they can bite your face off.
- hinkley 3y agoI don't even like the 4 business day feature branches we have. When we were rapidly developing we saw all sorts of merge problems. It only works now because the commit rate has dropped off, and the chances of merge problems are somewhere between quadratic and factorial.