- Feature Articles
- CodeSOD
- Error'd
-
Forums
-
Other Articles
- Random Article
- Alex's Soapbox
- Announcements
- Best of…
- Best of Email
- Best of the Sidebar
- Bring Your Own Code
- Coded Smorgasbord
- Mandatory Fun Day
- Off Topic
- Representative Line
- News Roundup
- Editor's Soapbox
- Software on the Rocks
- Souvenir Potpourri
- Sponsor Post
- Tales from the Interview
- The Daily WTF: Live
- Virtudyne
Edit Admin
I hate managers like that. Totally ignorant and instead of learning, just push their ignorance on everyone. At least the rest of the team knows better and ignores the dumbass.
Edit Admin
Why have conflicts with every branch when you can have conflicts with every commit?
Edit Admin
Having 20 years of experience means that when Bill started out, branching was most likely already a thing. I'm not really sure when the first VC with branching appeared, but I'd guess it was in the 1980s.
Admin
This sounds at best like someone who misunderstood the arguments against branch-heavy workflows, possibly due to reading opinion pieces that define "branch" differently to how git itself does, namely, as specifically that subset of branches which exist for long periods of time in projects where there's no requirement to maintain old versions.
Most of the arguments are strongest against those long-running "major project" branches, and secondarily against having a "new features" branch and one or more "fixes" branches... but that latter topology is probably imposed from outside anyway. And what's the betting this manager is basing it on CVS or SVN branches that are much more expensive than git?
Yes, you gotta rebase and fix conflicts, but that's always true, and the VCS-adjacent algorithms that don't have that, instead can't guarantee a lack of gibberish or eating one side's changes. So TRWTF might be structuring the codebase so that there's a lot of conflicts.
Admin
I spend way too much time on LinkedIn, and this is one of those annoying tech-bro flexes that frequently pops up. No branches! Trunk-based development! etc. Sure, go right ahead and handle your solo project that way, but don't ask me to join your team.
Admin
He should think of a branch merge as a single commit to the trunk and then get over it. As for falling out of sync, it likely is code for, "we don't think through our API design."