Mercurial > evolve
changeset 5607:db1dd9fec06c
unstable-list: add an item about author divergence resolution
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 14 Oct 2020 12:10:05 +0200 |
| parents | 4c2633a8d4d0 |
| children | 57030b9d71c3 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Wed Oct 14 12:09:41 2020 +0200 +++ b/docs/troubles-handling.rst Wed Oct 14 12:10:05 2020 +0200 @@ -411,3 +411,15 @@ **Current Support Level** Good: current implementation is expected to perform the planned stabilisation. + +D-C3: Commit author conflict +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**Stabilisation Strategy** + +Merge authors using 3-way merge. If unable to merge we concatenate +the two, separated by comma. (for e.g. "John Doe, Malcolm X") + +**Current Support Level** + +Good: current implementation is expected to perform the planned stabilisation.