mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 10:35:57 +03:00
fix conflicted alias message 2 (#5071)
Co-authored-by: aryairani <aryairani@users.noreply.github.com>
This commit is contained in:
parent
a45fc88fb1
commit
335512e331
@ -1372,7 +1372,9 @@ notifyUser dir = \case
|
|||||||
<> "or"
|
<> "or"
|
||||||
<> IP.makeExample' IP.delete
|
<> IP.makeExample' IP.delete
|
||||||
<> "all but one of the definitions; I'll use the remaining name when propagating updates."
|
<> "all but one of the definitions; I'll use the remaining name when propagating updates."
|
||||||
<> "(You can `rename` it back after the merge.)"
|
<> "(You can"
|
||||||
|
<> IP.makeExample' IP.moveAll
|
||||||
|
<> "it back after the merge.)"
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@ -977,7 +977,7 @@ project/alice> merge /bob
|
|||||||
there's nothing for me to decide.
|
there's nothing for me to decide.
|
||||||
* `move` or `delete` all but one of the definitions; I'll
|
* `move` or `delete` all but one of the definitions; I'll
|
||||||
use the remaining name when propagating updates. (You can
|
use the remaining name when propagating updates. (You can
|
||||||
`rename` it back after the merge.)
|
`move` it back after the merge.)
|
||||||
|
|
||||||
and then try merging again.
|
and then try merging again.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user