From 3fba506589fae3686fe9bc8124b84f6f53d3f3dd Mon Sep 17 00:00:00 2001
From: "Mr.tang" <1074461480@qq.com>
Date: Fri, 16 Mar 2018 23:44:55 +0800
Subject: [PATCH] [WIP] Add detailed git workflow (#603)

* add git workflow

* fix

* update contributing.md

* add github guides/remove git parts

* add github guides/remove git parts

* update
---
 contributing.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contributing.md b/contributing.md
index 51b3ba4f..0d74b0fb 100644
--- a/contributing.md
+++ b/contributing.md
@@ -62,9 +62,22 @@ If you'd like to work on a bug, please comment on it to let the maintainers know
 If someone else has already commented and taken up that bug, please refrain from working on it and submitting
 a PR without asking the maintainers as it leads to unnecessary duplication of effort.
 
+### Contribution guides
+
+* [https://guides.github.com/activities/hello-world/](https://guides.github.com/activities/hello-world/)
+* [https://guides.github.com/activities/forking/](https://guides.github.com/activities/forking/)
+
 # Creating a pull request
 
-When you create a [pull request](https://help.github.com/articles/creating-a-pull-request/) for a new fix or feature, be sure to mention the issue number for what you're working on. The best way to do it is to mention the issue like this at the top of your description:
+Set up a new remote that points to the original project so that you can update your local repository once any changes have made to remote.
+ 
+	$ git remote add upstream https://github.com/processing/p5.js-web-editor
+ 
+ and also before you submit a [pull request](https://help.github.com/articles/creating-a-pull-request/), please remember to fetch the changes using:
+
+	$ git fetch upstream
+
+When you create a pull request for a new fix or feature, be sure to mention the issue number for what you're working on. The best way to do it is to mention the issue like this at the top of your description:
 
     Fixes #333