Skip to content

Commit

Permalink
Update CONTRIBUTING.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@loodakrawa
loodakrawa committed Nov 9, 2015
1 parent 9779a36 commit ebf5623
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ If you add new files, please add the following header in the beginning of the fi

In general, this is the recommended way of doing things:

1. Develop new stuff in a feature branch (e.g. feature/name-of-feature)
1. Develop new stuff in a feature branch branched from develop (e.g. feature/name-of-feature)
2. After dev is done, squash commits into one (or a few meaningful ones)
3. Sync your master with upstream
4. Merge master into feature branch and fix all conflicts
5. Create pull request from your feature branch to upstream master
6. Sync your master with upstream when your pull request gets merged
3. Sync with the upstream repo
4. Merge develop into feature branch and fix all conflicts
5. Create pull request from your feature branch to upstream develop
6. Sync your repo with the upstream one after your pull request gets merged

##### Pull requests
Describe what the pull request does as best as you can.
Expand Down

0 comments on commit ebf5623

Please sign in to comment.