You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
adding and recommeding Squashing and merging a long-running branch ref and proving the option of rebase if need it (which is something I find it usuefull in many of other projects) #422
2. Click `Compare and pull request` and create PR for the associated branch.
50
50
3. Type a title and description of your PR and create PR
51
51
4. Please keep your PR in sync with the base branch.
52
+
It is recommended that you use [Squashing and merging a long-running branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squashing-and-merging-a-long-running-branch).
53
+
Otherwise, you have the option to rebase your `FEATURE_BRANCH` branch with the base branch (e.g. `main`).
52
54
```
53
55
git checkout main
54
56
git pull origin main
55
57
git checkout FEATURE_BRANCH
56
58
git rebase main
57
59
git push --force origin FEATURE_BRANCH
58
60
```
59
-
4.1 In case you are in a different `MY_FEATURE_BRANCH` branch, follow:
60
-
```
61
-
git checkout FEATURE_BRANCH
62
-
git pull origin FEATURE_BRANCH
63
-
git checkout MY_FEATURE_BRANCH
64
-
git rebase FEATURE_BRANCH
65
-
git push --force origin MY_FEATURE_BRANCH
66
-
```
67
61
5. Run `pre-commit` to tidy up code and documentation (see next section).
68
62
6. Request a PR review.
69
63
See [collaborating-with-pull-requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests) for further details.
0 commit comments