▲ 813 ▼ Manager: This task only takes 30 minutes. Why did it take you the whole day? (programming.dev) submitted 2 years ago by hypnotic_nerd@programming.dev to c/programmer_humor@programming.dev 98 comments fedilink hide all child comments
[–] Johanno@feddit.de 7 points 2 years ago (4 children) We make a singular commit per feature. permalink fedilink source parent hideshow 4 child comments replies: [–] KairuByte@lemmy.dbzer0.com 5 points 2 years ago I always find this hard to follow personally. permalink fedilink source parent [–] pomodoro_longbreak@sh.itjust.works 2 points 2 years ago (2 children) Trunk based, eh? Yeah, we do that on a couple teams where I'm at, too. I like the philosophy, but force pushing the same commit over and over as you're incorporating review feedback is antisocial, especially when you've got devs trying to test your changes out on their machines. permalink fedilink source parent hideshow 2 child comments replies: [–] Omgpwnies@lemmy.world 3 points 2 years ago (1 child) eh, just squash and merge. Feature branch can be messy as long as main is clean permalink fedilink source parent hideshow 1 child comment replies: [–] Johanno@feddit.de 1 point 2 years ago Yep. You have to make sure your feature branch works. permalink fedilink source parent
[–] KairuByte@lemmy.dbzer0.com 5 points 2 years ago I always find this hard to follow personally. permalink fedilink source parent
[–] pomodoro_longbreak@sh.itjust.works 2 points 2 years ago (2 children) Trunk based, eh? Yeah, we do that on a couple teams where I'm at, too. I like the philosophy, but force pushing the same commit over and over as you're incorporating review feedback is antisocial, especially when you've got devs trying to test your changes out on their machines. permalink fedilink source parent hideshow 2 child comments replies: [–] Omgpwnies@lemmy.world 3 points 2 years ago (1 child) eh, just squash and merge. Feature branch can be messy as long as main is clean permalink fedilink source parent hideshow 1 child comment replies: [–] Johanno@feddit.de 1 point 2 years ago Yep. You have to make sure your feature branch works. permalink fedilink source parent
[–] Omgpwnies@lemmy.world 3 points 2 years ago (1 child) eh, just squash and merge. Feature branch can be messy as long as main is clean permalink fedilink source parent hideshow 1 child comment replies: [–] Johanno@feddit.de 1 point 2 years ago Yep. You have to make sure your feature branch works. permalink fedilink source parent
[–] Johanno@feddit.de 1 point 2 years ago Yep. You have to make sure your feature branch works. permalink fedilink source parent