Commit 62ea82b
doc: add 'git clean -xfd' to backport guide
When changing from a recent version, e.g. 8.x to an older branch like 6.x
test artifacts sometimes hang around and cause failures. Using `git clean`
will prevent that from happening.
PR-URL: #15715
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent 6d41c85 commit 62ea82b
1 file changed
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,6 +44,11 @@ cd $NODE_DIR | |||
| 44 | 44 | git fetch upstream v6.x-staging:v6.x-staging -f | |
| 45 | 45 | # Assume we want to backport PR #10157 | |
| 46 | 46 | git checkout -b backport-10157-to-v6.x v6.x-staging | |
| 47 | + # Ensure there are no test artifacts from previous builds | ||
| 48 | + # Note that this command deletes all files and directories | ||
| 49 | + # not under revision control below the ./test directory. | ||
| 50 | + # It is optional and should be used with caution. | ||
| 51 | + git clean -xfd ./test/ | ||
| 47 | 52 | ``` | |
| 48 | 53 | ||
| 49 | 54 | 4. After creating the branch, apply the changes to the branch. The cherry-pick | |
0 commit comments