unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 02:25:39 +03:00
Code Issues Projects Releases Wiki Activity

Update merge precondition message: Conflicted aliases (#5070)

Browse Source
This commit is contained in:
Arya Irani 2024-06-10 20:42:01 -04:00 committed by GitHub
parent 7a70400443
commit a45fc88fb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unison-cli/src/Unison/CommandLine/OutputMessages.hs
View File

@ -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.)"
)
]
)

3
unison-src/transcripts/merge.output.md
View File

@ -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.