From 4ae5427d57686ec43f56c7fd6201866883e91ba9 Mon Sep 17 00:00:00 2001 From: Iva Koevska Date: Tue, 30 Sep 2014 14:27:08 +0300 Subject: [PATCH] Replacing references to the develop branch with references to master --- CONTRIBUTING.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ec1d9813f..0c6ac6a9bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,9 +50,9 @@ Before you submit a Pull Request, consider the following guidelines. ```bash git submodule update ``` -* Make your changes in a new `git` branch. We use the Gitflow branching model so you will have to branch from our develop branch. +* Make your changes in a new `git` branch. We use the Gitflow branching model so you will have to branch from our master branch. ```bash - git checkout -b my-fix-branch develop + git checkout -b my-fix-branch master ``` * Create your patch and include appropriate test cases. * Build your changes locally. @@ -71,10 +71,10 @@ Before you submit a Pull Request, consider the following guidelines. ```bash git push origin my-fix-branch ``` -* In GitHub, send a Pull Request to icenium-cli:develop. +* In GitHub, send a Pull Request to icenium-cli:master. * If we suggest changes, you can modify your branch, rebase, and force a new push to your GitHub repository to update the Pull Request. ```bash - git rebase develop -i + git rebase master -i git push -f ``` @@ -86,17 +86,17 @@ When the patch is reviewed and merged, you can safely delete your branch and pul ```bash git push origin --delete my-fix-branch ``` -* Check out the develop branch. +* Check out the master branch. ```bash - git checkout develop -f + git checkout master -f ``` * Delete the local branch. ```bash git branch -D my-fix-branch ``` -* Update your develop branch with the latest upstream version. +* Update your master branch with the latest upstream version. ``` - git pull --ff upstream develop + git pull --ff upstream master ``` [Back to Top][1]