Mercurial > evolve
changeset 5606:4c2633a8d4d0
unstable-list: add an item about divergence on changeset description
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 14 Oct 2020 12:09:41 +0200 |
| parents | af1d71f3a028 |
| children | db1dd9fec06c |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Wed Oct 14 12:09:15 2020 +0200 +++ b/docs/troubles-handling.rst Wed Oct 14 12:09:41 2020 +0200 @@ -398,3 +398,16 @@ Good: current implementation is expected to perform the planned stabilisation. +D-C2: Commit description conflict +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**Stabilisation Strategy** + +Merge commit description using text merge tool from user. + +Possible improvement: They are currently no way to "interrupt" and resume that +conflict resolution. Having some way to do that would be nice. + +**Current Support Level** + +Good: current implementation is expected to perform the planned stabilisation.