mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 02:25:39 +03:00
transcript output merge conflict
This commit is contained in:
parent
8b762c7908
commit
1be90b1414
@ -54,8 +54,8 @@ diffs/main> branch.create new
|
||||
|
||||
Done. I've created the new branch based off of main.
|
||||
|
||||
Tip: Use `merge /new /main` to merge your work back into the
|
||||
main branch.
|
||||
Tip: To merge your work back into the main branch, first
|
||||
`switch /main` then `merge /new`.
|
||||
|
||||
```
|
||||
```unison
|
||||
|
Loading…
Reference in New Issue
Block a user