From 8767b94d6eb7856d67e2a4ed4374334fcbb8d288 Mon Sep 17 00:00:00 2001 From: Jake Bolam Date: Wed, 30 Jan 2019 09:47:20 -0500 Subject: [PATCH] docs: improve contributing --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39e7e070..ad5fc68b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,6 +36,15 @@ curl -vX POST http://localhost:3000/ -d @test-webhook-payload.json \ --header "X-GitHub-Event: issue_comment" ``` +## Working with forks: +### Syncing a fork +1. `git remote add parent git@github.com:all-contributors/all-contributors-bot.git` +2. `git fetch parent` +3. `git checkout master` or `git checkout empty-contribs` (this branch on your fork) +4. `git merge parent/master` + +See https://help.github.com/articles/syncing-a-fork/ + ## Deployments There is a sandbox environment: