From e5abb8cd7896d3fa9f32383f4c9b037d94972aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Ara=C3=BAjo=20=5BSSW=5D?= Date: Mon, 22 Apr 2024 09:45:51 -0700 Subject: [PATCH] Update rule.md --- rules/merge-debt/rule.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rules/merge-debt/rule.md b/rules/merge-debt/rule.md index 8d654794375..878ba8949b1 100644 --- a/rules/merge-debt/rule.md +++ b/rules/merge-debt/rule.md @@ -10,28 +10,34 @@ authors: url: https://www.ssw.com.au/people/brook-jeynes - title: Gordon Beeming url: https://ssw.com.au/people/gordon-beeming + - title: Adam Cogan + url: https://ssw.com.au/people/adam-cogan related: - over-the-shoulder redirects: [] --- If you are in a team (i.e. an internal contributor), it is the PR author's responsibility to get a PR reviewed and action feedback ASAP. -As an internal contributor it's a good idea to have a [call with the PR reviewers](/over-the-shoulder). +As an internal contributor, it's a good idea to have a [call with the PR reviewers](/over-the-shoulder). If you are **not** part of the team (i.e. an outside contributor), reviewing the PR is the responsibility of the repo maintainers. Actioning the feedback is still the responsibility of the PR author. As an outside contributor, it's a good idea to chase the reviewers by reaching out with a comment on GitHub, or through the repo's community (e.g. Discord channels). + + +::: info +**Note:** Remember that before declaring a task 'Done' with a link, your [changes should be live](/include-links-in-emails/#ensure-your-changes-are-live) for verification. +::: + When a PR is created but left open for a long time, it becomes stale. Stale PRs equate to merge debt because the longer the PR stays open, the more changes occur on the main branch and the harder it is to merge back in. Merge debt refers to the amount of work a PR has to undergo before it can be merged into the main branch. If the PR is brand new, the amount of work required to merge is near to none, but as the PR stays open, the more work gets done on the main branch, leading to more work needing to be done to ensure the PR is up-to-date and able to be merged. - - Merge debt can be avoided by: * Ensuring PRs don't stay open for too long * Conducting daily reviews on repos to ensure all PRs that can be merged are merged -* Ensuring that once a PR is ready to be merged, an "over-the-shoulder" review occurs. +* Ensuring that once a PR is ready to be merged, an "over-the-shoulder" review occurs ::: bad ![Figure: Bad example - Pressing commit and forgetting about it. PR has been left open for a over 2 weeks](https://github.com/SSWConsulting/SSW.Website-v3/assets/25432120/5a67d6ed-a301-4d72-af00-8da4277c1b75)