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
- `Resolving a merge conflict using the command line <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line>`_
378
378
379
379
.. _git_from_patch:
380
380
@@ -552,7 +552,7 @@ prior to merging themselves, rather than asking the submitter to do them. This
552
552
can be particularly appropriate when the remaining changes are bookkeeping
553
553
items like updating ``Misc/ACKS``.
554
554
555
-
.. _Allow edits from maintainers: https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/
555
+
.. _Allow edits from maintainers: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork
556
556
557
557
To edit an open pull request that targets ``main``:
.. _comments on your Pull Request: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/commenting-on-a-pull-request
69
69
70
70
71
71
.. _pullrequest-steps:
@@ -363,7 +363,7 @@ This will get your changes up to GitHub.
If this is a pull request in response to a pre-existing issue on the
368
368
`issue tracker`_, please make sure to reference the issue number using
369
369
``gh-NNNNN:`` prefix in the pull request title and ``#NNNNN`` in the description.
@@ -398,7 +398,7 @@ existing patch. In this case, both parties should sign the :ref:`CLA <cla>`.
398
398
When creating a pull request based on another person's patch, provide
399
399
attribution to the original patch author by adding "Co-authored-by:
400
400
Author Name <email_address> ." to the pull request description and commit message.
401
-
See `the GitHub article <https://help.github.com/articles/creating-a-commit-with-multiple-authors/>`_
401
+
See `the GitHub article <https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors>`_
402
402
on how to properly add the co-author info.
403
403
404
404
See also :ref:`Applying a Patch to Git <git_from_patch>`.
0 commit comments