Commit 65d8ac7c authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Mention in admin/notes/repo how to mark commits that are not to be merged.

parent 86fe7502
...@@ -82,7 +82,9 @@ The exception is, if you know that the change will be difficult to ...@@ -82,7 +82,9 @@ The exception is, if you know that the change will be difficult to
merge to the trunk (eg because the trunk code has changed a lot). merge to the trunk (eg because the trunk code has changed a lot).
In that case, it's helpful if you can apply the change to both trunk In that case, it's helpful if you can apply the change to both trunk
and branch yourself (when committing the branch change, indicate and branch yourself (when committing the branch change, indicate
in the commit log that it should not be merged to the trunk; see below). in the commit log that it should not be merged to the trunk, by
including the phrase "Not to be merged to master", or any other phrase
that matches "merge").
* Installing changes from your personal branches. * Installing changes from your personal branches.
......
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