mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Update HotFixGuide.md
This commit is contained in:
parent
f6267db2b4
commit
90a375a50e
@ -17,7 +17,12 @@ found in the below sub-sections.
|
|||||||
- Otherwise, the most recent release-specific branch to which this hotfix
|
- Otherwise, the most recent release-specific branch to which this hotfix
|
||||||
applies.
|
applies.
|
||||||
- Lastly, if none of above, BASE.
|
- Lastly, if none of above, BASE.
|
||||||
4. At the bottom of the description of the merge-request add: `Backport: branch_name`
|
4. (If needed) If the hotfix is a backport (cherry-picked) of an existing merge-requests,
|
||||||
|
add a cross-reference each of the existing merge-request with the format of `!1234`
|
||||||
|
inside the description of the newly created merge-request.
|
||||||
|
- Cherry-pick each of the relevant commits of the existing merge-requests using
|
||||||
|
`git cherry-pick -x XXYYZZ`.
|
||||||
|
5. At the bottom of the description of the merge-request add: `Backport: branch_name`
|
||||||
directive for each of the branches that exists between BASE (inclusive) and
|
directive for each of the branches that exists between BASE (inclusive) and
|
||||||
the branch that we target our merge-request (exclusive).
|
the branch that we target our merge-request (exclusive).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user