Changeset View
Changeset View
Standalone View
Standalone View
documentation/content/en/articles/committers-guide/_index.adoc
| Show First 20 Lines • Show All 1,209 Lines • ▼ Show 20 Lines | |||||
| [source,shell] | [source,shell] | ||||
| .... | .... | ||||
| % cd ../src | % cd ../src | ||||
| % git subtree merge -P contrib/mtree vendor/NetBSD/mtree | % git subtree merge -P contrib/mtree vendor/NetBSD/mtree | ||||
| .... | .... | ||||
| 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 | ||||
| Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward before you get a chance to push, you would have to redo the merge. | Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward before you get a chance to push, you would have to redo the merge. | ||||
| Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**, | Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**, | ||||
| so instead of that you would have to recreate the commit. | so instead of that you would have to recreate the commit. | ||||
| ▲ Show 20 Lines • Show All 2,534 Lines • Show Last 20 Lines | |||||