Mercurial > evolve
changeset 5587:c2e71fc0efeb
unstable-list: add "merging files" section for content-divergence
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Tue, 22 Sep 2020 13:50:45 +0530 |
| parents | f701c75e53f6 |
| children | 5cbb1f356137 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Tue Sep 22 13:50:06 2020 +0530 +++ b/docs/troubles-handling.rst Tue Sep 22 13:50:45 2020 +0530 @@ -337,3 +337,27 @@ XXX: yet to decide resolution + +D-B: Merging files of divergent changesets +------------------------------------------ + +While merging the files, there are few sub-cases that could arise +like file content conflict, rename information conflict, multiple newest +predecessor. Let's see them in detail. + +D-B1: File content conflict +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +If there is a conflict in merging content of files we let the user to +resolve the conflict. + +D-B2: Rename information conflict +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +XXX: yet to explore + +D-B3: Multiple newest predecessor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +XXX: yet to explore +