Skip to content

Latest commit

 

History

History
51 lines (31 loc) · 2.83 KB

HOW_TO_HANDLE_PULL_REQUESTS.md

File metadata and controls

51 lines (31 loc) · 2.83 KB
Raw

How to Handle Pull Requests

This document is for whoever has the ability to merge pull requests in the Git repositories associated with BigchainDB.

If the pull request is from an employee of ascribe GmbH, then you can ignore this document.

If the pull request is from someone who is not an employee of ascribe, then:

  • Have they agreed to the Individual Contributor Agreement in the past? (Troy, Greg, and others have a list.) If yes, then you can merge the PR and ignore the rest of this document.
  • Do they belong to a company or organization which agreed to the Entity Contributor Agreement in the past, and will they be contributing on behalf of that company or organization? (Troy, Greg, and others have a list.) If yes, then you can merge the PR and ignore the rest of this document.
  • Otherwise, go to the pull request in question and post a comment using this template:

Hi @nameofuser

Before we can merge this pull request, which may contain your intellectual property in the form of copyright or patents, our lawyers say we need you or your organization to agree to one of our contributor agreements. If you are contributing on behalf of yourself (and not on behalf of your employer or another organization you are part of) then you should:

  1. Go to: https://www.bigchaindb.com/cla/
  2. Read the Individual Contributor Agreement
  3. Fill in the form "For Individuals"
  4. Check the box to agree
  5. Click the SEND button

If you're contributing as an employee, and/or you want all employees of your employing organization to be covered by our contributor agreement, then someone in your organization with the authority to enter agreements on behalf of all employees must do the following:

  1. Go to: https://www.bigchaindb.com/cla/
  2. Read the Entity Contributor Agreement
  3. Fill in the form "For Organizations”
  4. Check the box to agree
  5. Click the SEND button

We will email you (or your employer) with further instructions.

(END OF COMMENT)

Once they click SEND, we (ascribe) will get an email with the information in the form. (Troy gets those emails for sure, I'm not sure who else.) The next step is to send an email to the email address submitted in the form, saying something like (where the stuff in [square brackets] should be replaced):

Hi [NAME],

The next step is for you to copy the following block of text into the comments of Pull Request #[NN] on GitHub:

BEGIN BLOCK

This is to confirm that I agreed to and accepted the BigchainDB [Entity/Individual] Contributor Agreement at https://www.bigchaindb.com/cla/ and to represent and warrant that I have authority to do so.

[Insert long random string here. One good source of those is https://www.grc.com/passwords.htm ]

END BLOCK

(END OF EMAIL)

The next step is to wait for them to copy that comment into the comments of the indicated pull request. Once they do so, it's safe to merge the pull request.