File tree Expand file tree Collapse file tree 1 file changed +0
-14
lines changed Expand file tree Collapse file tree 1 file changed +0
-14
lines changed Original file line number Diff line number Diff line change @@ -62,20 +62,6 @@ or using GitHub’s `suggestion
62
62
(The latter is preferred because it gives the contributor a choice in
63
63
whether to accept the changes.)
64
64
65
- Our default merge policy is to squash all PR commits into a single
66
- commit. Users who wish to bring the latest changes from ``master ``
67
- into their branch should be advised to merge, not to rebase. Even
68
- when merge conflicts arise, don’t ask for a rebase unless you know
69
- that a contributor is experienced with git. Instead, rebase the branch
70
- yourself, force-push to their branch, and advise the contributor on
71
- how to force-pull. If the contributor is no longer active, you may
72
- take over their branch by submitting a new pull request and closing
73
- the original. In doing so, ensure you communicate that you are not
74
- throwing the contributor's work away! You should use GitHub's
75
- ``Co-authored-by: `` keyword for commit messages to credit the
76
- original contributor.
77
-
78
-
79
65
Please add a note to a pull request after you push new changes; GitHub
80
66
may not send out notifications for these.
81
67
You can’t perform that action at this time.
0 commit comments