Skip to content

Commit

Permalink
Embrace the Forking Git workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Sep 10, 2020
1 parent 4277b0f commit 1d3b973
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Before opening a fresh issue, do a search on [the wiki](http://robots.uc3m.es/in
* Feel free to attach any other information illustrating the issue if copying and pasting text is not an option.

Notes:
* We follow the [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/) git workflow.
* We follow the [Forking](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow/) Git workflow.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation instructions for installing from source can be found [here](doc/teo
#### Fork & Pull Request

1. [Fork the repository](https://github.com/roboticslab-uc3m/teo-openrave-models/fork)
2. Create your feature branch (`git checkout -b my-new-feature`) off the `develop` branch, following the [GitFlow git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
2. Create your feature branch (`git checkout -b my-new-feature`) off the `master` branch, following the [Forking Git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow)
3. Commit your changes
4. Push to the branch (`git push origin my-new-feature`)
5. Create a new Pull Request
Expand Down

0 comments on commit 1d3b973

Please sign in to comment.