sync: Fix double merge conflict resolution handling.
Ie, when there'a a conflicted merge we may get foo.variant-xxxx created in a merge. If a second merge conflict occurs on that new file, it was not falling back to putting in the whole key (which should stop the merge conflicts happening for good, but is ugly).
This commit is contained in:
parent
bd8f358e6d
commit
919a7d7316
2 changed files with 2 additions and 1 deletions
|
@ -302,7 +302,7 @@ mergeFile file key
|
|||
| otherwise = go $ shortHash $ key2file key
|
||||
where
|
||||
varmarker = ".variant-"
|
||||
doubleconflict = varmarker `isSuffixOf` (dropExtension file)
|
||||
doubleconflict = varmarker `isInfixOf` file
|
||||
go v = takeDirectory file
|
||||
</> dropExtension (takeFileName file)
|
||||
++ varmarker ++ v
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue