Skip to content

Commit 583ded5

Browse files
committed
Add git flow develop branch to contributing guide
1 parent c351fe5 commit 583ded5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ See the Github guide on creating forks for more details.
6767
Git branches are “cheap.” Creating branches in Git is incredibly easy and its an ideal way to isolate a specific set
6868
of changes. You may be fixing several things at one time but by keeping your changes isolated it will help us to
6969
find and apply only the changes we’re interested in. You should create a clean branch based on the latest
70-
save_queue/master when doing this. It is important you follow these steps exactly,
70+
save_queue/develop when doing this. It is important you follow these steps exactly,
7171
it will prevent you from accidentally including unrelated changes from your local repository into the branch.
7272

7373
For example, if we were submitting a patch to fix an issue with the CSS in the flash error message you could create
7474
a branch as follows:
7575

7676
$ git remote add upstream git://github.com/AlexParamonov/save_queue.git
7777
$ git fetch upstream
78-
$ git checkout -b fix-css-for-error-flash --track upstream/master
78+
$ git checkout -b fix-css-for-error-flash --track upstream/develop
7979

80-
The fetch command will grab all of the latest commits from the Save Queue master branch. Don’t worry,
80+
The fetch command will grab all of the latest commits from the Save Queue develop branch. Don’t worry,
8181
it doesn’t alter your working repository in a harmful way. The track part of the command will tell git that this
82-
branch should track with the remote version of the upstream master. This is another way of saying that the branch
82+
branch should track with the remote version of the upstream develop. This is another way of saying that the branch
8383
should be based on a clean copy of the latest official source code (without any of your unrelated local changes.)
8484

8585
You can then do work locally on this topic branch and push it up to your Github fork when you are done. So in our

0 commit comments

Comments
 (0)