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

Update CONTRIBUTING.md: CLA -> DCO #764

Closed

drice-buf wants to merge 2 commits into connectrpc:main from drice-buf:patch-1

Contributor

drice-buf commented Jul 9, 2024

See connectrpc/connect-query-es#386

drice-buf and others added 2 commits

July 9, 2024 10:45


          Update CONTRIBUTING.md: CLA -> DCO

a825cb0

See connectrpc/connect-query-es#386


          Merge branch 'main' into patch-1

eb54193

Member

jhump commented Jul 29, 2024

Whoops, I tried to resolve the merge conflict, forgetting that the resulting GitHub-generated commit won't sign-off on the commit 🤦

And now I realize that the conflict is because this was basically already merged in #765. So closing this one.

jhump closed this

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

Labels

None yet