Skip to content

Reconcile dev branch with main after 1.6.0#2313

Closed
abernix wants to merge 3 commits intodevfrom
main
Closed

Reconcile dev branch with main after 1.6.0#2313
abernix wants to merge 3 commits intodevfrom
main

Conversation

@abernix
Copy link
Member

@abernix abernix commented Dec 22, 2022

While @BrynCooke's #2265 did make an attempt at doing this, it was squashed into dev rather than done as a true merge.

Trying this again as a real merge to unblock the 1.7.0 release in #2312.

(It is unfortunate that rules cannot be put in place to prevent that, but automation is probably going to be our friend here, eventually).

bryn and others added 3 commits December 13, 2022 14:53
Release 1.6.0
Co-authored-by: bryn <bryn@apollographql.com>
@abernix abernix self-assigned this Dec 22, 2022
@abernix abernix removed the request for review from StephenBarlow December 22, 2022 17:12
@abernix
Copy link
Member Author

abernix commented Dec 22, 2022

Closing as this is going to be easier to do on the command line than through GitHub because of merge conflicts in NEXT_CHANGELOG.md, coupled with branch protection rules.

@abernix abernix closed this Dec 22, 2022
@abernix
Copy link
Member Author

abernix commented Dec 22, 2022

Done manually as a real merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants