Mercurial > evolve
comparison docs/troubles-handling.rst @ 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 |
comparison
equal
deleted
inserted
replaced
| 5605:af1d71f3a028 | 5606:4c2633a8d4d0 |
|---|---|
| 396 | 396 |
| 397 **Current Support Level** | 397 **Current Support Level** |
| 398 | 398 |
| 399 Good: current implementation is expected to perform the planned stabilisation. | 399 Good: current implementation is expected to perform the planned stabilisation. |
| 400 | 400 |
| 401 D-C2: Commit description conflict | |
| 402 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
| 403 | |
| 404 **Stabilisation Strategy** | |
| 405 | |
| 406 Merge commit description using text merge tool from user. | |
| 407 | |
| 408 Possible improvement: They are currently no way to "interrupt" and resume that | |
| 409 conflict resolution. Having some way to do that would be nice. | |
| 410 | |
| 411 **Current Support Level** | |
| 412 | |
| 413 Good: current implementation is expected to perform the planned stabilisation. |