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.

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

Add CONTRIBUTING.md #1042

Merged
merged 7 commits into from
Jun 21, 2018
Merged

Add CONTRIBUTING.md #1042

merged 7 commits into from
Jun 21, 2018

Conversation

dcousens
Copy link
Contributor

@dcousens dcousens commented Apr 16, 2018

See changes

@junderw
Copy link
Member

junderw commented Apr 16, 2018

We should add:

  1. GPG sign your commits.
  2. Or else the person reviewing will co-author and sign with their GPG key (this should be done right before merging, after the author rebases / squashes as instructed.) (https://help.github.com/articles/creating-a-commit-with-multiple-authors/) and (https://help.github.com/articles/signing-commits-using-gpg/) respectively.
  3. Github signed commits (if you make commit through Web UI currently Github will sign your commit.) are fine.

@dcousens
Copy link
Contributor Author

dcousens commented Apr 16, 2018

(@junderw can you add that? I sourced https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md throughout)

@dcousens
Copy link
Contributor Author

We have branch protection in place... but it'd be nice if we could remove the ability to simply switch-it-off in the settings...

Any ideas?

@junderw
Copy link
Member

junderw commented May 29, 2018

hmmmmmmmm.....

If we restrict master to PR merges only, the master HEAD should always be a merge commit...

I wonder if there's some sort of setting file (ie. .gitignore) that will allow for some sort of pre-hook for git push... not allowing push (locally) if the HEAD commit msg doesn't start with "Merge..." etc.

git is deep, so I wouldn't be surprised if there were such a thing.

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

Successfully merging this pull request may close these issues.

None yet

3 participants