Skip to content

Fixed whitespace errors. #1791

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
Merged
merged 23 commits into from
Jul 25, 2022
Merged

Fixed whitespace errors. #1791

merged 23 commits into from
Jul 25, 2022

Conversation

capn-freako
Copy link
Contributor

At Matthew's request.

capn-freako and others added 23 commits May 5, 2022 12:50
@capn-freako
Temporary check-in.
27746d8
@capn-freako
Last linearity axiom proved.
65989fd
@capn-freako
Merge branch 'master' of https://github.com/agda/agda-stdlib
c057439
@capn-freako
Final edits before initial pull request.
2d7abea
@capn-freako
Second attempt at PR1767.
b6c7519
@capn-freako
Removed some unneeded publics.
7c205f9
@capn-freako
Shifted to proof-local reasoning module openning, as per Jacques.
ea73683
@capn-freako
Eliminated unneccesary x, as per Jacques.
c9c8798
@capn-freako
Reverted to f from semantic brackets, as per Jacques.
c18c68a
@capn-freako
Switched to A.<op> notation, as per Jacques.
caabb3a
@capn-freako
Changes requested by Matthew Daggitt.
3c11956
@capn-freako
Temporary check-in only!
88e5c2a
@capn-freako
Changes, as per Matthew Daggitt, re: PR agda#1767
d2da8f0
@capn-freako
Responding to Jacques feedback.
c5de4d1
@capn-freako
Merge branch 'master' of https://github.com/agda/agda-stdlib
2c17a8d 
Keeping my fork in sync., while awaiting PR acceptance.
@capn-freako
Clean-up after merging in upstream master.
b790ffb
@capn-freako
Responding to Matthew`s requests.
8b0a487
@capn-freako
Responding to additional requests from Matthew.
aec2203
@capn-freako
Responding to Matthew`s final requests.
b6da4e9
@MatthewDaggitt
Tweak to CHANGELOG
be44f32
@capn-freako
Merge branch 'master' of https://github.com/agda/agda-stdlib
63aec07 
Immediately after PR 1767 acceptance.
@capn-freako
Merge branch 'master' of github.com:capn-freako/agda-stdlib
0ad8e72 
Because a push got rejected.
@capn-freako
Fixed some whitespace errors.
f5d9097
@capn-freako
Copy link
Contributor Author

capn-freako commented Jul 24, 2022 •
edited
Loading

@MatthewDaggitt , why is this PR showing so many included commits?
There should only be one.
I pulled from upstream/master, after you accepted/merged PR #1767 ; I would've thought that doing so would prevent this sort of thing. Is there something else I need to do in addition?

The good news is: the actual file changes are exactly as I would expect.

@gallais
Copy link
Member

gallais commented Jul 25, 2022 •
edited
Loading

You probably started your new PR from the branch already containing the commits instead of from master.
Pulling the updated master is not enough: you need to to checkout to it too.

Same for #1792

Edit: ah wait no it's because your own master is polluted by all of these commits: https://github.com/capn-freako/agda-stdlib
We have a guide on how to use git branches to avoid these issues.

@MatthewDaggitt MatthewDaggitt added this to the v2.0 milestone Jul 25, 2022
@MatthewDaggitt MatthewDaggitt merged commit 24daf13 into agda:master Jul 25, 2022
@andreasabel andreasabel mentioned this pull request Jul 24, 2023
Merged
@andreasabel andreasabel mentioned this pull request Aug 27, 2023
Merged
@andreasabel andreasabel mentioned this pull request Oct 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
refactoring
Projects
None yet
Milestone
v2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@capn-freako @gallais @MatthewDaggitt