File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -28,8 +28,15 @@ in a piecemeal fashion:
2828 - A subsequent task would use the previous task's branch as its base
2929 - Mark each PR as draft to avoid premature merge
3030 - Request review in order from the initial PR but do not merge yet
31- - Once all PRs in the series have been approved, merge from the top down
32- - Avoids cascading rebases and merge conflicts
31+ - Once all PRs in the series have been approved
32+ - Freeze develoment on the origin repo
33+ - Merge from the top down into the subtree merge PR
34+ - Avoids cascading rebases and merge conflicts
35+ - Once only the subtree merge PR is left, manually merge the branch
36+ - Merging the PR with squash enabled would discard the history that
37+ we want to retain
38+ - Close the subtree merge PR
39+ - Archive the original repo
3340
3441Tooling such as
3542[ git-machete] ( https://github.com/VirtusLab/git-machete ) or
You can’t perform that action at this time.
0 commit comments