Skip to content

Commit

Permalink
Update guidelines for how to submit PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbeckingsale committed Dec 18, 2018
1 parent 327cd32 commit 4a40fbd
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Expand Up @@ -15,11 +15,11 @@ changes up to GitHub and create pull requests.

## Developing a New Feature

New features should be based on the `develop` branch. When you want to create a
new feature, first ensure you have an up-to-date copy of the `develop` branch:
New features should be based on the `master` branch. When you want to create a
new feature, first ensure you have an up-to-date copy of the `master` branch:

$ git checkout develop
$ git pull origin develop
$ git checkout master
$ git pull origin master

You can now create a new branch to develop your feature on:

Expand All @@ -34,15 +34,15 @@ branch to GitHub and create a PR.

## Developing a Bug Fix

First, check if the change you want to make has been fixed in `develop`. If so,
we suggest you either start using the `develop` branch, or temporarily apply the
First, check if the change you want to make has been fixed in `master`. If so,
we suggest you either start using the `master` branch, or temporarily apply the
fix to whichever version of SAMRAI you are using.

Assuming there is an unsolved bug, first make sure you have an up-to-date copy
of the develop branch:

$ git checkout develop
$ git pull origin develop
$ git checkout master
$ git pull origin master

Then create a new branch for your bugfix:

Expand Down

0 comments on commit 4a40fbd

Please sign in to comment.