saxnot
How do you merge when all people who can merge committed to a branch and people can't sign off branches containing their own commits?
Mar 20 at 8:21pmWeb
Show threadsaxnotMar 21

This is not a real problem I have (yet).

But at work we're looking into best practices for code review / dev process in general

Show threadChristoph HusbergMar 21

@saxnot there are several possibilities to solve this, but normally the team itself comes up with a solution. From my experience I would propose the following:

- If such a review case occurs, the team does a huddle review. If the team is big (I.e.: >5 devs) two separate huddles are better.
- ..., the team does a split review, where every participant needs to review the code, including their own. If the teams resources are limited, paired reviews are possible, or an appointed pair of reviewers.

Show threadbunnyheroMar 20
@saxnot ... oops
Show threadsebastian ⚡Mar 20
@saxnot Hire an additional intern, who has not committed to the branch yet?
Show threadsaxnotMar 20
@sebastian good idea
Show threadOwenMar 20
@saxnot You make an exception to the policy, document it, and move forwards.
Show threadDrahflowMar 20
@saxnot git rebase and suddenly only one person contributed to the (new) branch?