diff options
| author | Ceri Davies <ceri@FreeBSD.org> | 2023-04-06 16:42:30 +0000 |
|---|---|---|
| committer | Ceri Davies <ceri@FreeBSD.org> | 2023-04-06 16:42:30 +0000 |
| commit | 38e20a6ef29e3700100958b422e9f8481977cf9b (patch) | |
| tree | 63a1501a656c96c59902ecf08a1ab1e9a2968a10 | |
| parent | e9f5700a04aa4d0462a50267fda00ceebe87163a (diff) | |
| download | doc-38e20a6ef29e3700100958b422e9f8481977cf9b.tar.gz doc-38e20a6ef29e3700100958b422e9f8481977cf9b.zip | |
committers-guide: minor improvements to the English
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 151f2d08c6..c0446de944 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1189,14 +1189,14 @@ The following steps should be taken to easily recreate the merge commit as if `g * Re-do the subtree merge * Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it. ** The trailing '.' is important, as is being at the top level of the repo. -** Rather than switching branches to XXX, it splats the contents of XXX onto of the repo +** Rather than switching branches to XXX, it splats the contents of XXX on top of the repo * Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch). * Make sure the branches are the same. * Do whatever review you need, including having others check it out if you think that's needed. * Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe) * Delete the branches once the commit is upstream. They are throw-a-way. -The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment help line commands to descriptions above): +The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment to help link commands to descriptions above): [source,shell] .... @@ -1239,7 +1239,7 @@ There is nothing magic about these names. Upstream will not allow you to push them, but never the less, please pay attention to the exact commands above. Some commands use syntax that differs only slightly from typical uses and that different behavior is critical to this recipe working. -==== How to redo the if need be +==== How to redo things if need be If you've tried to do the push in the previous section and it fails, then you should do the following to 'redo' things. This sequence keeps the commit with the commit message always at XXX~1 to make committing easier. |