From 1e0af1a3f419219abb2a3e0cc5473c77005721e1 Mon Sep 17 00:00:00 2001 From: sergeyfrolov Date: Fri, 11 Aug 2017 16:12:45 -0400 Subject: [PATCH] Add upstream merge instruction --- CONTRIBUTORS_GUIDE.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS_GUIDE.md b/CONTRIBUTORS_GUIDE.md index ea5dc82..7dcfb2d 100644 --- a/CONTRIBUTORS_GUIDE.md +++ b/CONTRIBUTORS_GUIDE.md @@ -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. \ No newline at end of file +Basically, current tests aim to provide a sanity check. + +# Merging upstream +```Bash +git remote add -f golang git@github.com: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 +```