Skip to content

Commit a3379f2

Browse files
add note on patch paths (#513)
Co-authored-by: Jenny Hickson <61183013+jennyhickson@users.noreply.github.com>
1 parent 2411d3c commit a3379f2

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

source/WorkingPractices/branch_migration.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,19 @@ a fork <forking>` of the repo you are migrating to.
5858
git switch -c <branch name> <tag to branch from>
5959
e.g. git switch -c new_migrated_branch git_migration
6060
61-
#. Apply the patch file onto the git branch,
61+
#. Apply the patch file onto the git branch.
6262

6363
.. code-block::
6464
6565
git apply --reject /path/to/branch_diff.patch
6666
67+
.. note::
68+
69+
The paths in the patch file will be as short as possible to show all files
70+
changed, so you may need to change directory. eg. if you branch only
71+
contains changes in the ``rose-stem`` directory, then you will need to move
72+
into the ``rose-stem`` directory to successfully apply the patch.
73+
6774
#. If your fcm and git branches are from an equivalent branch point, there
6875
shouldn't be any conflicts applying the patch file. If there are conflicts
6976
then these will be recorded in ``*.rej`` files. The output of the ``apply``

0 commit comments

Comments
 (0)