Add Note for Conflicts section

In some cases the cherry-picked patch contains the original patch's
"Conflicts" lines, that were valid only on the source branch (the
patch was cherry-picked from). To help the reviewers these should
be removed from the commit message.

Change-Id: I6a4efb1e703f6634cf2d260480153d0ceae3a46f
This commit is contained in:
Elod Illes 2019-11-12 13:09:44 +01:00
parent 0e80c32f56
commit c7f10fd758

View File

@ -363,6 +363,10 @@ resolving the conflicts yourself and proposing the resulting patch. Please keep
"Conflicts" lines in the commit message to help reviewers, for example:
https://review.opendev.org/686292/
.. note::
If a cherry-picked patch's commit message contains "Conflicts" lines that
are not valid anymore in the target branch, then remove those lines.
Change-Ids
----------
When cherry-picking a commit, keep the original :code:`Change-Id` and gerrit