News for hackers. Stuff that matters.

A comment on Prime Video Abandons Serverless Distributed Stack for Monolith, saves 90%. Parent comment

Re:Prime Video Abandons Serverless Distributed Stack for Mon... by withinboredom on Thursday May 04, 2023 @06:35AM (#35813408)
Don’t merge. Rebase only. Keep a linear history.

When committing, do a ff-only of ‘main’ to your branch. Yes, this forces everyone to rebase before “merging” but in practice, this results in the least amount of failures, tests being run after you resolved any conflicts, etc.

If you can use GitHub merge queues, that solves a ton of this, and you can run tests on the final merge before actually merging instead of relying on rebasing.

[ Parent | on HN ]
Re:Prime Video Abandons Serverless Distributed Stack for Mon... by whstl on Thursday May 04, 2023 @09:12AM (#35814726)
"Don’t merge. Rebase only. Keep a linear history."

This. It makes life so much simpler. With teams that don't have a lot of experience with git, however, I tend to use the "Squash and Merge" feature, coupled with forcing a linear history.

[ Parent | on HN ]