Hellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 2 days agoWhat do you call your production branch?lemmy.caimagemessage-square51fedilinkarrow-up1479arrow-down111
arrow-up1468arrow-down1imageWhat do you call your production branch?lemmy.caHellfire103@lemmy.ca to Programmer Humor@programming.devEnglish · 2 days agomessage-square51fedilink
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up66·edit-22 days 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-up31·2 days agoNever merge. Only cherry pick.
minus-squareRusty@lemmy.calinkfedilinkEnglisharrow-up3·1 day ago Conflict resolution only through melee combat. Wrestle with Jeff, Prepare for death.
minus-squareNocturnalMorning@lemmy.worldlinkfedilinkarrow-up9·2 days agoHow have you survived in this world without exploding into a million little fiery merge conflicts?
minus-squarertxn@lemmy.worldlinkfedilinkarrow-up14·2 days 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.
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.