Commit e8e3bd0f authored by Eli Zaretskii's avatar Eli Zaretskii

; Improve merge documentation in CONTRIBUTE

* CONTRIBUTE (branches): Tell how to avoid merging of
non-backported changes.
parent 5eb9989f
...@@ -184,15 +184,19 @@ If you are fixing a bug that exists in the current release, be sure to ...@@ -184,15 +184,19 @@ If you are fixing a bug that exists in the current release, be sure to
commit it to the release branch; it will be merged to the master commit it to the release branch; it will be merged to the master
branch later. 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
trunk (eg because the trunk code has changed a lot), you can apply the master (eg because the code on master has changed a lot), you can
change to both trunk and branch yourself. It could also happen that a apply the change to both master and branch yourself. It could also
change is cherry-picked from master to the release branch, and so happen that a change is cherry-picked from master to the release
doesn't need to be merged back. In these cases, indicate in the branch, and so doesn't need to be merged back. In these cases,
release branch commit log that there is no need to merge the commit to indicate in the release branch commit log that there is no need to
the trunk; start the commit message with "Backport:". gitmerge.el merge the commit to master; start the commit message with "Backport:".
will then exclude that commit from the merge to trunk. gitmerge.el will then exclude that commit from the merge to trunk.
Some changes should not be merged to master at all, for whatever
reasons. These should be marked by including something like "Do not
merge to master" or anything that matches gitmerge-skip-regexp (see
gitmerge.el) in the log message.
** 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