diff options
| author | Daniel Ebdrup Jensen <debdrup@FreeBSD.org> | 2021-01-08 13:04:42 +0000 |
|---|---|---|
| committer | Daniel Ebdrup Jensen <debdrup@FreeBSD.org> | 2021-01-08 13:04:42 +0000 |
| commit | e194334c7994de1d5aa91259075cc4e05d0b4a73 (patch) | |
| tree | 49c02e5fc402452ae883798beacef153556d9942 /en_US.ISO8859-1/articles/committers-guide | |
| parent | f3bf61d5614d54621681c2613edfa77c3eb659db (diff) | |
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index e05587a219..db04ddd5f0 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -1280,7 +1280,7 @@ You need a Passphrase to protect your secret key.</screen> <sect4> <title>Preparing the Merge Target</title> - <para>Because of the mergeinfo propagation issues described + <para>Due to the mergeinfo propagation issues described earlier, it is very important to never merge changes into a sparse working copy. Always use a full checkout of the branch being merged into. For instance, |