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
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+9-3Lines changed: 9 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -302,7 +302,7 @@ $ git log
302
302
$ git commit --fixup <COMMIT_SHA> ...
303
303
```
304
304
305
-
Alternatively, you can also create a new commit with a commit message starting with `fixup! <commit header>` followed the commit header of the commit being fixed up. For example,
305
+
Alternatively, you can also create a new commit with a commit message starting with `fixup! <commit header>` followed by the commit header of the commit being fixed up. For example,
306
306
307
307
<!-- run-disable -->
308
308
@@ -312,11 +312,17 @@ $ git commit -m "fixup! feat: add support for computing the absolute value"
312
312
313
313
If the history needs modification, a contributor will modify the history during the merge process. The rationale for **not** rewriting public history is that doing so invalidates the commit history for anyone else who has pulled your changes, thus imposing additional burdens on collaborators to ensure that their local versions match the modified history.
314
314
315
+
In the event that you need to pull in changes from the `upstream` repository after having pushed changes to your remote repository (e.g., to incorporate fixes unrelated to your work in order to address CI failures, etc), perform a standard [merge][git-merge].
316
+
317
+
```bash
318
+
$ git pull upstream develop
319
+
```
320
+
315
321
#### Step 10: Land
316
322
317
323
After any changes have been resolved and continuous integration tests have passed, a contributor will approve a [pull request][github-pull-request] for inclusion in the project. Once merged, the [pull request][github-pull-request] will be updated with the merge commit, and the [pull request][github-pull-request] will be closed.
318
324
319
-
Note that, during the merge process, multiple commits will often be [squashed][git-rewriting-history].
325
+
Note that, in most cases during the merge process, multiple commits will be [squashed][git-rewriting-history] into a single commit.
320
326
321
327
#### Step 11: Celebrate
322
328
@@ -327,7 +333,7 @@ Note that, during the merge process, multiple commits will often be [squashed][g
327
333
### GitHub
328
334
329
335
- When linking to specific lines of code in an issue or a pull request, hit the `y` key while viewing a file on GitHub. Doing so reloads the page with a URL that includes the specific version of the file you are viewing. This ensures that, when you refer to specific lines, these same lines can be easily viewed in the future, even if the content of the file changes.
330
-
- GitHub does not send notifications when you push a commit and update a [pull request][github-pull-request], so be sure to comment on the pull request thread to inform reviewers that you have made changes.
336
+
- GitHub does not send notifications to project maintainers when you push a commit and update a [pull request][github-pull-request], so be sure to comment on the pull request thread to inform reviewers that you have made changes and request another review using the GitHub UI.
0 commit comments