Mercurial > evolve

comparison docs/troubles-handling.rst @ 5589:cbc886623dc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 af1d71f3a028
comparison
equal deleted inserted replaced
5588:5cbb1f356137 5589:cbc886623dc1
371 D-B3: Multiple newest predecessor 371 D-B3: Multiple newest predecessor
372 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 372 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
373 373
374 XXX: yet to explore 374 XXX: yet to explore
375 375
376
377 D-C: Merging metadata changes and create resultant changeset
378 ------------------------------------------------------------
379
380 While merging the metadata, there are few sub-cases that could arise
381 like branch name conflict, commit message conflict, commit author conflict.
382 If everything goes fine, we create the resultant changeset as a resolution of
383 content-divergence.