We have a pretty good code review process, but there are couple of issues. The most annoying problem is merging. From time to time the number of stuff to merge grows rapidly and some of the commits are getting old. As a result, rebasing is a pain (conflicts).
What can we do to avoid it? I can think of two possible solutions:
- Merging Thursday. From 10 to 12 every week we merge PRs
- Have a timeout on PR. If it's in peer review for a week, spam everybody in the team.