Commit ca947054 authored by Eli Zaretskii's avatar Eli Zaretskii

* CONTRIBUTE (Branches): Improve wording for back-ported commits.

parent f234fc2c
...@@ -193,10 +193,12 @@ branch later. ...@@ -193,10 +193,12 @@ branch later.
However, if you know that the change will be difficult to merge to the However, if you know that the change will be difficult to merge to the
trunk (eg because the trunk code has changed a lot), you can apply the trunk (eg because the trunk code has changed a lot), you can apply the
change to both trunk and branch yourself. Indicate in the release change to both trunk and branch yourself. It could also happen that a
branch commit log that there is no need to merge the commit to the change is cherry-picked from master to the release branch, and so
trunk; start the commit message with "Backport:". gitmerge.el will doesn't need to be merged back. In these cases, indicate in the
then exclude that commit from the merge to trunk. release branch commit log that there is no need to merge the commit to
the trunk; start the commit message with "Backport:". gitmerge.el
will then exclude that commit from the merge to trunk.
** Other process information ** Other process information
......
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