qiurui
/
freebsd-doc
mirror of https://git.FreeBSD.org/doc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify that the vendor merge commits should have proper commit messages 

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D29745
This commit is contained in:
Mark Johnston 2021-04-13 09:41:03 -04:00
parent f4353eecab
commit 6f71dc766b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/content/en/articles/committers-guide/_index.adoc
View File

@ -1215,6 +1215,7 @@ The sources live in `contrib/mtree` since it is upstream software.
This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch.
If there were conflicts, you would need to fix them before committing. If there were conflicts, you would need to fix them before committing.
Include details about the changes being merged in the merge commit message.
==== Rebasing your change against latest FreeBSD source tree ==== Rebasing your change against latest FreeBSD source tree