Hellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 1 day agoWhat do you call your production branch?lemmy.caimagemessage-square56linkfedilinkarrow-up1485arrow-down19
arrow-up1476arrow-down1imageWhat do you call your production branch?lemmy.caHellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 1 day agomessage-square56linkfedilink
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up73·edit-21 day agoBranch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.
minus-squareSeductiveTortoise@piefed.sociallinkfedilinkEnglisharrow-up34·1 day agoNever merge. Only cherry pick.
minus-squarepeoplebeproblems@midwest.sociallinkfedilinkEnglisharrow-up18·1 day agoYou have met every team I have ever worked with apparently
minus-squareRusty@lemmy.calinkfedilinkEnglisharrow-up2·21 hours ago Conflict resolution only through melee combat. Wrestle with Jeff, Prepare for death.
minus-squareNocturnalMorning@lemmy.worldlinkfedilinkarrow-up12·1 day agoHow have you survived in this world without exploding into a million little fiery merge conflicts?
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up14·1 day agoI let the interns handle those. If they survive, they get bragging rights.
Branch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.
Never merge. Only cherry pick.
You have met every team I have ever worked with apparently
Wrestle with Jeff, Prepare for death.
How have you survived in this world without exploding into a million little fiery merge conflicts?
I let the interns handle those. If they survive, they get bragging rights.