Skip to content

Commit

Permalink
Add master vs patch-release branches (#6523)
Browse files Browse the repository at this point in the history
  • Loading branch information
hamoid authored and arturoc committed Jan 20, 2020
1 parent 2d2b88f commit e6ed593
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions INSTALL_FROM_GITHUB.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,30 @@ Once all changes are downloaded try to compile a program. It if fails it is poss

Finally, if your setup depends on some of the scripts from the scripts folder, you may need to re-run them. For instance, if you use Qt Creator and have trouble creating new OF projects you may want to run `scripts/qtcreator/install_template.sh` again.

### Note: master vs patch-release branches

After an openFrameworks release, bug fixes will be eventually added to the `patch-release` branch while new features will land in the `master` branch instead.

If you need the recent bug fixes, run `git branch` to see if `patch-release` is already in your system.

A. If it's not, get that branch:

```
$ git fetch origin patch-release
$ git checkout -b patch-release
```

B. If it's already there, switch to it:

```
$ git checkout patch-release
```

Finally run
```
$ git pull
```
to download those bug fixes to your local `patch-release` branch, then try compile your program and see if the bug that was troubling you is now gone.

# How to submit your pull requests

Expand Down

0 comments on commit e6ed593

Please sign in to comment.