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

Adding DCO and CoC #771

Merged
merged 1 commit into from
Jun 11, 2017
Merged

Adding DCO and CoC #771

merged 1 commit into from
Jun 11, 2017

Conversation

mikeal
Copy link
Contributor

@mikeal mikeal commented Oct 14, 2015

No description provided.

@Fishrock123 Fishrock123 mentioned this pull request Oct 15, 2015
Closed
@Fishrock123
Copy link
Contributor

LGTM

@refack refack merged commit b7f0619 into master Jun 11, 2017
@refack refack mentioned this pull request Jun 11, 2017
Merged
@gibfahn gibfahn deleted the dco-and-coc branch June 11, 2017 18:56
@gibfahn gibfahn mentioned this pull request Jun 11, 2017
Closed
@bnoordhuis
Copy link
Member

@refack No merges, darn it. As well, did this PR contain up-to-date versions?

@addaleax
Copy link
Member

As well, did this PR contain up-to-date versions?

No, of neither document.

@gibfahn
Copy link
Member

gibfahn commented Jun 12, 2017 •
edited
Loading

No merges, darn it

I'd be +1 on reverting back to the previous commit and re-applying it with updated versions. Happy to do it myself if there is agreement.

Also +1 on turning off Merging for all the nodejs repos. Squash and merge is fine (and the Rebase and Merge doesn't particularly cause issues), but merging is just awful (IMHO).

@addaleax
Copy link
Member

@gibfahn As far as I can tell, this was either Squash and Merge or Rebase and Merge; either way, the original Author information was lost.

@gibfahn
Copy link
Member

gibfahn commented Jun 12, 2017

It was definitely a normal merge

image

@addaleax
Copy link
Member

Ah, sorry – I guess I misread this because Github shows the commits ordered by date and this one was so old…

@refack
Copy link
Contributor

refack commented Jun 12, 2017

@refack No merges, darn it. As well, did this PR contain up-to-date versions?

Ohh, that went horribly wrong 🤦‍♂️
I'll be happy to force push this out.

@bnoordhuis
Copy link
Member

Yes, let's roll back.

@refack refack restored the dco-and-coc branch June 12, 2017 14:10
@refack
Copy link
Contributor

refack commented Jun 12, 2017

Done.

@refack refack mentioned this pull request Jun 12, 2017
Closed
@maclover7 maclover7 deleted the dco-and-coc branch July 10, 2018 03:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@refack refack refack approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@mikeal @Fishrock123 @bnoordhuis @addaleax @gibfahn @refack