Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge trunk #4995

Open
wants to merge 31 commits into
base: cp/fzf-lib-scoping
Choose a base branch
from
Open

merge trunk #4995

wants to merge 31 commits into from

Conversation

aryairani
Copy link
Contributor

@aryairani aryairani commented May 21, 2024 •
edited
Loading

this just merges trunk as of yesterday into cp/fzf-lib-scoping, and hopefully i fixed the conflicts correctly.

mitchellwrosen and others added 30 commits May 8, 2024 11:57
@mitchellwrosen
pull up where we load a git-pulled branch into memory
6dcd616
@mitchellwrosen
separate importing code from loading branches
cc4a91a
@mitchellwrosen
merge work
9a0ef3d
@mitchellwrosen
explicitly ignore ignored return values
aee317a
@mitchellwrosen
⅄ trunk → topic/merge5
3813bfb
@mitchellwrosen
⅄ topic/merge4 → topic/merge5
9daaa8d
@mitchellwrosen
merge work
3e0e10e
@mitchellwrosen
merge work (not compiling)
a77c10a
@mitchellwrosen
fix compiler error
88f4ff1
@mitchellwrosen
fix up undefineds
5dcf56d
@mitchellwrosen
regenerate merge.md output
f80b07d
@mitchellwrosen
begin forming merge API for pull to call
af71ab2
@mitchellwrosen
make pull perform a new merge, not an old merge
75e0e3c
@mitchellwrosen
slightly better error messages
06b743a
@mitchellwrosen
⅄ trunk → topic/merge5
b9a45d5
@mitchellwrosen
disallow pulling into an arbitrary path
1ccb978
@mitchellwrosen
make pull call new merge instead of old merge
bc54e4d
@mitchellwrosen
fix warning error and remove unused PinBoard code
3b8bdf5
@mitchellwrosen
⅄ trunk → topic/merge5
acf34b6
@mitchellwrosen
revert removing ApplicativeDo from default extensions because apparently
9d7fe1f 
we spookily rely on it! fragile! wow!
@mitchellwrosen
improve pull error messages
0c622f8
@mitchellwrosen
slightly improve help lib.install
cbed387
@mitchellwrosen
fix typo
d9bc18f
@aryairani
Merge pull request #4966 from unisonweb/topic/merge5
2ec8e01
@aryairani
Merge pull request #4972 from unisonweb/install-help
6197d4c
@mitchellwrosen
improve push output
2a21ed5
@ChrisPenner
remove unused incoming hashes event
d7077c9
@aryairani
Merge pull request #4991 from unisonweb/cp/unused-event
1b5fda3
@aryairani
Merge pull request #4990 from unisonweb/24-05-20-better-push-output
9fc96ed
@aryairani
merge trunk
1eadc3b
@unisonweb unisonweb deleted a comment from mergify bot May 21, 2024
@aryairani aryairani changed the base branch from trunk to cp/fzf-lib-scoping May 21, 2024 19:25
@aryairani aryairani changed the title just a ci sanity check merge trunk May 21, 2024
@aryairani aryairani requested a review from ChrisPenner May 21, 2024 19:25
@aryairani aryairani marked this pull request as ready for review May 22, 2024 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrisPenner ChrisPenner Awaiting requested review from ChrisPenner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aryairani @mitchellwrosen @ChrisPenner