Mercurial > evolve
comparison docs/troubles-handling.rst @ 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 | 43a5371fa669 |
comparison
equal
deleted
inserted
replaced
| 5606:4c2633a8d4d0 | 5607:db1dd9fec06c |
|---|---|
| 409 conflict resolution. Having some way to do that would be nice. | 409 conflict resolution. Having some way to do that would be nice. |
| 410 | 410 |
| 411 **Current Support Level** | 411 **Current Support Level** |
| 412 | 412 |
| 413 Good: current implementation is expected to perform the planned stabilisation. | 413 Good: current implementation is expected to perform the planned stabilisation. |
| 414 | |
| 415 D-C3: Commit author conflict | |
| 416 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
| 417 | |
| 418 **Stabilisation Strategy** | |
| 419 | |
| 420 Merge authors using 3-way merge. If unable to merge we concatenate | |
| 421 the two, separated by comma. (for e.g. "John Doe, Malcolm X") | |
| 422 | |
| 423 **Current Support Level** | |
| 424 | |
| 425 Good: current implementation is expected to perform the planned stabilisation. |