Skip to content

add note on patch paths #513

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
jennyhickson merged 2 commits into from
Dec 2, 2025
Merged

add note on patch paths #513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d961989
add note on patch paths
james-bruten-mo Dec 2, 2025
8152526
Merge branch 'main' into patch_apply
jennyhickson Dec 2, 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
9 changes: 8 additions & 1 deletion source/WorkingPractices/branch_migration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,19 @@ a fork <forking>` of the repo you are migrating to.
git switch -c <branch name> <tag to branch from>
e.g. git switch -c new_migrated_branch git_migration

#. Apply the patch file onto the git branch,
#. Apply the patch file onto the git branch.

.. code-block::

git apply --reject /path/to/branch_diff.patch

.. note::

The paths in the patch file will be as short as possible to show all files
changed, so you may need to change directory. eg. if you branch only
contains changes in the ``rose-stem`` directory, then you will need to move
into the ``rose-stem`` directory to successfully apply the patch.

#. If your fcm and git branches are from an equivalent branch point, there
shouldn't be any conflicts applying the patch file. If there are conflicts
then these will be recorded in ``*.rej`` files. The output of the ``apply``
Expand Down