Hellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 2 months agoWhat do you call your production branch?lemmy.caimagemessage-square61linkfedilinkarrow-up1596arrow-down113
arrow-up1583arrow-down1imageWhat do you call your production branch?lemmy.caHellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 2 months agomessage-square61linkfedilink
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up91·edit-22 months 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-up45·2 months agoNever merge. Only cherry pick.
minus-squarepeoplebeproblems@midwest.sociallinkfedilinkEnglisharrow-up22·2 months agoYou have met every team I have ever worked with apparently
minus-squareNocturnalMorning@lemmy.worldlinkfedilinkarrow-up13·2 months agoHow have you survived in this world without exploding into a million little fiery merge conflicts?
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up18·2 months agoI let the interns handle those. If they survive, they get bragging rights.
minus-squareRusty@lemmy.calinkfedilinkEnglisharrow-up3·2 months ago Conflict resolution only through melee combat. Wrestle with Jeff, Prepare for death.
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
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.
Wrestle with Jeff, Prepare for death.