Commit e500d607 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'maint_clarify_merge_process'

6161a64a

 maint: Add further details about merging topics to release branch
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !2238
parents 0ff961f1 6161a64a
Pipeline #110363 passed with stage
in 0 seconds
...@@ -51,15 +51,18 @@ using a local branch named ``release-$ver``, where ``$ver`` is the version ...@@ -51,15 +51,18 @@ using a local branch named ``release-$ver``, where ``$ver`` is the version
number of the current release in the form ``$major.$minor``. It is always number of the current release in the form ``$major.$minor``. It is always
merged into ``master`` before publishing. merged into ``master`` before publishing.
To merge some ``$topic`` branch into ``release``, first create the local Before merging a ``$topic`` branch into ``release``, verify that the
branch: ``$topic`` branch has already been merged to ``master`` via the usual
``Do: merge`` process. Then, to merge the ``$topic`` branch into
``release``, start by creating the local branch:
.. code-block:: shell .. code-block:: shell
git fetch origin git fetch origin
git checkout -b release-$ver origin/release git checkout -b release-$ver origin/release
Merge the ``$topic`` branch into the local ``release-$ver`` branch: Merge the ``$topic`` branch into the local ``release-$ver`` branch, making
sure to include a ``Merge-request: !xxxx`` footer in the commit message:
.. code-block:: shell .. code-block:: shell
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment