diff options
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index b385d68c985..c9c4b74f090 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -186,10 +186,12 @@ branch later. 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 -change to both trunk and branch yourself. Indicate in the 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. +change to both trunk and branch yourself. It could also happen that a +change is cherry-picked from master to the release branch, and so +doesn't need to be merged back. In these cases, indicate in the +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 |