Mercurial > evolve
changeset 5589:cbc886623dc1
unstable-list: add "merging metadata" section for content-divergence
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 14 Oct 2020 12:08:23 +0200 |
| parents | 5cbb1f356137 |
| children | 582e3be0a277 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Sat Oct 10 22:44:24 2020 +0530 +++ b/docs/troubles-handling.rst Wed Oct 14 12:08:23 2020 +0200 @@ -373,3 +373,11 @@ XXX: yet to explore + +D-C: Merging metadata changes and create resultant changeset +------------------------------------------------------------ + +While merging the metadata, there are few sub-cases that could arise +like branch name conflict, commit message conflict, commit author conflict. +If everything goes fine, we create the resultant changeset as a resolution of +content-divergence.