mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-21 07:17:25 +03:00
29 lines
321 B
Markdown
29 lines
321 B
Markdown
# Update on conflict
|
|
|
|
```ucm:hide
|
|
.> builtins.merge
|
|
```
|
|
|
|
```unison
|
|
a.x = 1
|
|
b.x = 2
|
|
```
|
|
|
|
Cause a conflict:
|
|
```ucm
|
|
.> add
|
|
.merged> merge .a
|
|
.merged> merge .b
|
|
```
|
|
|
|
Updating conflicted definitions works fine, and the associated patch contains two entries.
|
|
|
|
```unison
|
|
x = 3
|
|
```
|
|
|
|
```ucm
|
|
.merged> update
|
|
.merged> view.patch
|
|
```
|