This is how my team does it. If we have a large feature with multiple people pushing code, we’ll create a “feature branch” that we then branch against. We run

This is how my team does it. If we have a large feature with multiple people pushing code, we’ll create a “feature branch” that we then branch against. We run our PR flow into the “feature branch” then merge the feature branch into main when ready. As part of smaller features, people rebase from main and work upstream changes back into the feature branch. Worst case, we spend and hour near the end of the project on a “merge party” where we work out all of the conflicts.