mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-17 13:27:30 +03:00
Update merge precondition message: Conflicted aliases (#5070)
This commit is contained in:
parent
7a70400443
commit
a45fc88fb1
@ -1372,6 +1372,7 @@ notifyUser dir = \case
|
||||
<> "or"
|
||||
<> IP.makeExample' IP.delete
|
||||
<> "all but one of the definitions; I'll use the remaining name when propagating updates."
|
||||
<> "(You can `rename` it back after the merge.)"
|
||||
)
|
||||
]
|
||||
)
|
||||
|
@ -976,7 +976,8 @@ project/alice> merge /bob
|
||||
* `update` the definitions to be the same again, so that
|
||||
there's nothing for me to decide.
|
||||
* `move` or `delete` all but one of the definitions; I'll
|
||||
use the remaining name when propagating updates.
|
||||
use the remaining name when propagating updates. (You can
|
||||
`rename` it back after the merge.)
|
||||
|
||||
and then try merging again.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user