2021-05-24 20:00:05 +03:00
|
|
|
Checks that squash and merge do the same thing, with nontrivial history that
|
|
|
|
includes a merge conflict.
|
|
|
|
|
|
|
|
```unison
|
2021-05-24 22:30:30 +03:00
|
|
|
x.a.p = "af"
|
|
|
|
x.a.q = "ef"
|
2021-05-24 20:00:05 +03:00
|
|
|
```
|
|
|
|
|
|
|
|
```ucm
|
|
|
|
|
|
|
|
I found and typechecked these definitions in scratch.u. If you
|
|
|
|
do an `add` or `update`, here's how your codebase would
|
|
|
|
change:
|
|
|
|
|
|
|
|
⍟ These new definitions are ok to `add`:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
x.a.p : Text
|
|
|
|
x.a.q : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
```
|
|
|
|
```ucm
|
|
|
|
.> add
|
|
|
|
|
|
|
|
⍟ I've added these definitions:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
x.a.p : Text
|
|
|
|
x.a.q : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
.> fork x y
|
|
|
|
|
|
|
|
Done.
|
|
|
|
|
|
|
|
.> fork x s
|
|
|
|
|
|
|
|
Done.
|
|
|
|
|
|
|
|
.> fork x m
|
|
|
|
|
|
|
|
Done.
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
.> delete y.a.p
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Name changes:
|
|
|
|
|
|
|
|
Original Changes
|
2021-05-24 22:30:30 +03:00
|
|
|
1. m.a.p ┐ 2. y.a.p (removed)
|
|
|
|
3. s.a.p │
|
|
|
|
4. x.a.p │
|
|
|
|
5. y.a.p ┘
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Tip: You can use `undo` or `reflog` to undo this change.
|
|
|
|
|
|
|
|
```
|
|
|
|
```unison
|
2021-05-24 22:30:30 +03:00
|
|
|
y.a.p = "fij"
|
2021-05-24 20:00:05 +03:00
|
|
|
```
|
|
|
|
|
|
|
|
```ucm
|
|
|
|
|
|
|
|
I found and typechecked these definitions in scratch.u. If you
|
|
|
|
do an `add` or `update`, here's how your codebase would
|
|
|
|
change:
|
|
|
|
|
|
|
|
⍟ These new definitions are ok to `add`:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
y.a.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
```
|
|
|
|
```ucm
|
|
|
|
.> add
|
|
|
|
|
|
|
|
⍟ I've added these definitions:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
y.a.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
```
|
|
|
|
```unison
|
2021-05-24 22:30:30 +03:00
|
|
|
y.b.p = "wie"
|
2021-05-24 20:00:05 +03:00
|
|
|
```
|
|
|
|
|
|
|
|
```ucm
|
|
|
|
|
|
|
|
I found and typechecked these definitions in scratch.u. If you
|
|
|
|
do an `add` or `update`, here's how your codebase would
|
|
|
|
change:
|
|
|
|
|
|
|
|
⍟ These new definitions are ok to `add`:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
y.b.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
```
|
2021-05-24 22:30:30 +03:00
|
|
|
Merge back into the ancestor.
|
|
|
|
|
2021-05-24 20:00:05 +03:00
|
|
|
```ucm
|
|
|
|
.> add
|
|
|
|
|
|
|
|
⍟ I've added these definitions:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
y.b.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
.> merge y.b y.a
|
|
|
|
|
|
|
|
Here's what's changed in y.a after the merge:
|
|
|
|
|
|
|
|
New name conflicts:
|
|
|
|
|
2022-02-08 05:29:57 +03:00
|
|
|
1. p#l2mmpgn323 : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
↓
|
2022-02-08 05:29:57 +03:00
|
|
|
2. ┌ p#l2mmpgn323 : Text
|
|
|
|
3. └ p#nm3omrdks9 : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Tip: You can use `todo` to see if this generated any work to
|
|
|
|
do in this namespace and `test` to run the tests. Or you
|
|
|
|
can use `undo` or `reflog` to undo the results of this
|
|
|
|
merge.
|
|
|
|
|
|
|
|
.> delete.term 1
|
|
|
|
|
|
|
|
Resolved name conflicts:
|
|
|
|
|
2022-02-08 05:29:57 +03:00
|
|
|
1. ┌ y.a.p#l2mmpgn323 : Text
|
|
|
|
2. └ y.a.p#nm3omrdks9 : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
↓
|
2022-02-08 05:29:57 +03:00
|
|
|
3. y.a.p#nm3omrdks9 : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Tip: You can use `undo` or `reflog` to undo this change.
|
|
|
|
|
|
|
|
.> merge y m
|
|
|
|
|
|
|
|
Here's what's changed in m after the merge:
|
|
|
|
|
|
|
|
Updates:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
1. a.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
↓
|
2021-05-24 22:30:30 +03:00
|
|
|
2. a.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Added definitions:
|
|
|
|
|
2021-05-24 22:30:30 +03:00
|
|
|
3. ┌ a.p : Text
|
|
|
|
4. └ b.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Tip: You can use `todo` to see if this generated any work to
|
|
|
|
do in this namespace and `test` to run the tests. Or you
|
|
|
|
can use `undo` or `reflog` to undo the results of this
|
|
|
|
merge.
|
|
|
|
|
|
|
|
.> squash y s
|
|
|
|
|
|
|
|
Here's what's changed in s after the merge:
|
|
|
|
|
2021-05-24 23:28:00 +03:00
|
|
|
Updates:
|
2021-05-24 20:00:05 +03:00
|
|
|
|
2021-05-25 05:04:43 +03:00
|
|
|
1. a.p : Text
|
2021-05-24 23:28:00 +03:00
|
|
|
↓
|
2021-05-25 05:04:43 +03:00
|
|
|
2. a.p : Text
|
2021-05-24 23:28:00 +03:00
|
|
|
|
|
|
|
Added definitions:
|
|
|
|
|
2021-05-25 05:04:43 +03:00
|
|
|
3. ┌ a.p : Text
|
|
|
|
4. └ b.p : Text
|
2021-05-24 20:00:05 +03:00
|
|
|
|
|
|
|
Tip: You can use `todo` to see if this generated any work to
|
|
|
|
do in this namespace and `test` to run the tests. Or you
|
|
|
|
can use `undo` or `reflog` to undo the results of this
|
|
|
|
merge.
|
|
|
|
|
|
|
|
.s> todo
|
|
|
|
|
2021-05-24 23:28:00 +03:00
|
|
|
✅
|
|
|
|
|
|
|
|
No conflicts or edits in progress.
|
2021-05-24 20:00:05 +03:00
|
|
|
|
2021-05-28 16:26:55 +03:00
|
|
|
.m> todo
|
|
|
|
|
|
|
|
✅
|
|
|
|
|
|
|
|
No conflicts or edits in progress.
|
|
|
|
|
2021-05-24 20:00:05 +03:00
|
|
|
```
|