From 5e92b70b438ed0673c5042ff5cff506430356154 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sat, 29 Oct 2022 16:58:40 -0700 Subject: [PATCH] extend explanation of force push --- docs/sop/sop_upstream_prep_checklist.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/sop/sop_upstream_prep_checklist.md b/docs/sop/sop_upstream_prep_checklist.md index b195b08..aeca6ff 100644 --- a/docs/sop/sop_upstream_prep_checklist.md +++ b/docs/sop/sop_upstream_prep_checklist.md @@ -75,4 +75,6 @@ downward to the stable branch. For example: This applies to any specific rocky repo, such as comps, pungi, peridot-config, and so on. As it is expected some repos will deviate in commit history, it is OK -to force push. +to force push, under the assumption that changes made in the lower branch exists +in the upper branch. That way you can avoid changes/functionality being reverted +on accident.