Skip to content

Replacing references to the develop branch with references to master #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2014
Merged

Replacing references to the develop branch with references to master #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="http://nvie.com/posts/a-successful-git-branching-model/">Gitflow branching model</a> so you will have to branch from our develop branch.
* Make your changes in a new `git` branch. We use the <a href="http://nvie.com/posts/a-successful-git-branching-model/">Gitflow branching model</a> 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.
Expand All @@ -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
```

Expand All @@ -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]
Expand Down