Skip to content

Tweak branch updates #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
James Bruten (james-bruten-mo) merged 2 commits into from
Oct 17, 2025
Merged

Tweak branch updates #468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ae0b6
amend wording
jennyhickson Oct 17, 2025
a27f288
tense
jennyhickson Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions source/WorkingPractices/maintaining_forks.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ contains the newly released code.
fork.

* Doing this will not update your local clone, this will also require
a ``git pull`` command.
a ``git pull`` command for each branch you wish to update.

.. tab-item:: git commands

Expand Down Expand Up @@ -206,7 +206,8 @@ merging in ``main`` to resolve conflicts. This can be done by,
Ensure that your fork is up to date with the upstream repository. See
:ref:`syncing your fork <syncing_fork>` for details on how to do this.

Then ensure that any synced changes are available in your local clone,
Then ensure that knowledge of any synced changes is available in your
local clone,

.. code-block:: shell

Expand All @@ -216,7 +217,7 @@ merging in ``main`` to resolve conflicts. This can be done by,

.. code-block:: shell

git merge <branch>
git merge origin/<branch>

If there are any merge conflicts you can now fix these using your conflict
tool of choice.
Expand Down