|
Size: 105
Comment:
|
Size: 1043
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| All about handling unsupported merge state records. | Handling unsupported merge state records. <<TableOfContents>> == Mercurial pointed me to this page. Help! == '''tl;dr:''' abort the merge (`hg update --clean`, `hg rebase --abort`, etc), or upgrade to the latest version of Mercurial. == What is a merge state record? == The merge state stores the state of a paused merge on disk. This includes * what commits are being merged * what files have been resolved New versions of Mercurial may store additional data in the merge state. This data will cause older versions of Mercurial to abort. This only happens when a newer version of Mercurial ''starts'' a merge (via `hg merge`, `hg rebase` etc) and an older version of Mercurial is used to continue the merge ''on the same disk or network filesystem''. ||'''Additional data''' ||'''Compatible versions''' ||'''Description''' || ||`C` ||>= 3.7 ||Change/delete conflicts || ||`D` ||>= 3.7 ||Files automatically resolved by merge driver (see MergeDriverPlan) || |
Merge State Records
Handling unsupported merge state records.
1. Mercurial pointed me to this page. Help!
tl;dr: abort the merge (hg update --clean, hg rebase --abort, etc), or upgrade to the latest version of Mercurial.
2. What is a merge state record?
The merge state stores the state of a paused merge on disk. This includes
- what commits are being merged
- what files have been resolved
New versions of Mercurial may store additional data in the merge state. This data will cause older versions of Mercurial to abort. This only happens when a newer version of Mercurial starts a merge (via hg merge, hg rebase etc) and an older version of Mercurial is used to continue the merge on the same disk or network filesystem.
Additional data
Compatible versions
Description
C
>= 3.7
Change/delete conflicts
D
>= 3.7
Files automatically resolved by merge driver (see MergeDriverPlan)