Created
May 6, 2020 19:44
-
-
Save runarorama/3f80771ca44492889fed04c4e33a26b2 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
☝️ The namespace ._prs.ceedubs.pr34 is empty. | |
._prs.ceedubs.pr34> pull-request.load git@github.com:unisonweb/base:.trunk git@github.com:ceedubs/unison-base:.prs._genEither | |
I checked out git@github.com:unisonweb/base:.trunk to base. | |
I checked out git@github.com:ceedubs/unison-base:.prs._genEither to head. | |
The merged result is in merged. | |
Use `diff.namespace base merged` to see what's been updated. | |
Use `todo merged.patch merged` to see what work is remaining for the merge. | |
Use `push git@github.com:unisonweb/base:.trunk merged` to push the changes. | |
._prs.ceedubs.pr34> todo merged.patch merged | |
✅ | |
No conflicts or edits in progress. | |
._prs.ceedubs.pr34> diff.namespace base merged | |
Added definitions: | |
1. metadata.authors.ceedubs : Author | |
2. metadata.authors.ceedubs.guid : GUID | |
3. metadata.copyrightHolders.ceedubs : CopyrightHolder | |
4. metadata.licences.ceedubs2020 : License | |
5. test.gen.either : '{Gen} a | |
-> '{Gen} b | |
-> '{Gen} Either a b (+3 metadata) | |
6. test.gen.either.doc : Doc (+1 metadata) | |
7. test.gen.either.test : [Result] (+3 metadata) | |
._prs.ceedubs.pr34> fork head phead | |
Done. | |
._prs.ceedubs.pr34> patch base.patch phead | |
._prs.ceedubs.pr34> diff.namespace head phead | |
Updates: | |
1. List.flatMap : (a ->{𝕖} [b]) -> [a] ->{𝕖} [b] | |
↓ | |
2. List.flatMap : (a ->{e} [b]) -> [a] ->{e} [b] | |
There were 46 auto-propagated updates. | |
._prs.ceedubs.pr34> fork base rebase | |
Done. | |
._prs.ceedubs.pr34> merge phead.metadata rebase.metadata | |
Here's what's changed in rebase.metadata after the merge: | |
Added definitions: | |
1. authors.ceedubs : Author | |
2. authors.ceedubs.guid : GUID | |
3. copyrightHolders.ceedubs : CopyrightHolder | |
4. licences.ceedubs2020 : License | |
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. | |
._prs.ceedubs.pr34> merge phead.test.gen rebase.test.gen | |
Here's what's changed in rebase.test.gen after the merge: | |
Added definitions: | |
1. either : '{Gen} a -> '{Gen} b -> '{Gen} Either a b (+3 metadata) | |
2. either.doc : Doc (+1 metadata) | |
3. either.test : [Result] (+4 metadata) | |
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. | |
._prs.ceedubs.pr34> diff.namespace base rebase | |
Added definitions: | |
1. metadata.authors.ceedubs : Author | |
2. metadata.authors.ceedubs.guid : GUID | |
3. metadata.copyrightHolders.ceedubs : CopyrightHolder | |
4. metadata.licences.ceedubs2020 : License | |
5. test.gen.either : '{Gen} a | |
-> '{Gen} b | |
-> '{Gen} Either a b (+3 metadata) | |
6. test.gen.either.doc : Doc (+1 metadata) | |
7. test.gen.either.test : [Result] (+4 metadata) | |
._prs.ceedubs.pr34> delete.term rebase.test.gen.either.test | |
Name changes: | |
Original Changes | |
1. _prs.ceedubs.pr34.merge2.test.gen.either.test ┐ 2. _prs.ceedubs.pr34.rebase.test.gen.either.test (removed) | |
3. _prs.ceedubs.pr34.phead.test.gen.either.test │ | |
4. _prs.ceedubs.pr34.rebase.test.gen.either.test ┘ | |
Tip: You can use `undo` or `reflog` to undo this change. | |
._prs.ceedubs.pr34> diff.namespace base rebase | |
Added definitions: | |
1. metadata.authors.ceedubs : Author | |
2. metadata.authors.ceedubs.guid : GUID | |
3. metadata.copyrightHolders.ceedubs : CopyrightHolder | |
4. metadata.licences.ceedubs2020 : License | |
5. test.gen.either : '{Gen} a | |
-> '{Gen} b | |
-> '{Gen} Either a b (+3 metadata) | |
6. test.gen.either.doc : Doc (+1 metadata) | |
._prs.ceedubs.pr34> links 6 | |
1. head.metadata.licences.ceedubs2020 : License | |
Tip: Try using `display 1` to display the first result or `view 1` to view its | |
source. | |
._prs.ceedubs.pr34> cd rebase | |
._prs.ceedubs.pr34.rebase> link metadata.authors.ceedubs test.gen.either.doc | |
Updates: | |
1. _prs.ceedubs.pr34.rebase.test.gen.either.doc : Doc | |
+ 2. authors.ceedubs : Author | |
._prs.ceedubs.pr34.rebase> push https://github.com/unisonweb/base:.trunk |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment