Skip to navigation
Abort: unresolved merge conflicts (see 'hg help resolve')
28.08.18
1. hg resolve -l 2. hg resolve -m FILE source: abort: unresolved merge conflicts. Use "hg resolve -l" to list the conflicting files followed by "hg resolve -m FILE..." to mark them as resolved after fixing the conflicts.
http://mercurial.808500.n3.nabble.com/hg-resolve-td801190.html
Reply
Anonymous
Information Epoch 1763484193
Design for visibility.
Home
Notebook
Contact us
