Skip to content

Commit

Permalink
Add upstream merge instruction
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyfrolov authored Aug 11, 2017
1 parent 3ab65b6 commit 1e0af1a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion CONTRIBUTORS_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,13 @@ Tests exist, but coverage is very limited. What's covered is a conjunction of
(e.g. no automatic checks for renegotiations, parroting quality and such)

plus we test some other minor things.
Basically, current tests aim to provide a sanity check.
Basically, current tests aim to provide a sanity check.

# Merging upstream
```Bash
git remote add -f golang [email protected]:golang/go.git
git checkout -b golang-upstream golang/master
git subtree split -P src/crypto/tls/ -b golang-tls-upstream
git checkout master
git merge --no-commit golang-tls-upstream
```

0 comments on commit 1e0af1a

Please sign in to comment.