Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions source/WorkingPractices/branch_migration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ a fork <forking>` of the repo you are migrating to.
git switch -c <branch name> <tag/hash to branch from>
e.g. git switch -c new_migrated_branch git_migration

If the ``git_migration`` tag doesn't exist in your clone, then you may need
to :ref:`sync tags <sync_fork_tags>`.

#. Rsync the changes over from the fcm export to the git clone. Use ``--delete``
to remove any files you have deleted in your branch. Use
``--exclude=.git --exclude=.svn`` so that the version control directories
Expand Down
14 changes: 14 additions & 0 deletions source/WorkingPractices/maintaining_forks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,20 @@ contains the newly released code.
local clone while using ``git`` commands will not update the remote
repository without pushing. ``gh`` can be used to update either.

.. _sync_fork_tags:

Syncing Fork Tags
-----------------

If you wish to sync tags to your fork, this requires using git commands. Ensure
that the upstream repository is set as a :ref:`remote source <git_remote>`. Then
run the following,

.. code-block::

git fetch --tags upstream
git push --tags

.. _updating_branch:

Updating Branches
Expand Down