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 2c440ad commit bb6a357
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ env:
global:
- CACHE_DIR=~/cached-deps
- YCM_CHECKOUT=ycm-0.11
matrix:
jobs:
- YARP_CHECKOUT=yarp-3.4
- YARP_CHECKOUT=yarp-3.3

matrix:
jobs:
include:
- if: type = cron
compiler: gcc
Expand Down Expand Up @@ -60,7 +60,7 @@ install:
source "$TRAVIS_BUILD_DIR/scripts/travis/git-cache-dependency.sh"
--package-name COLOR_DEBUG
--repo-url https://github.com/roboticslab-uc3m/color-debug
--repo-checkout develop
--repo-checkout master
before_script:
- mkdir -p "$TRAVIS_BUILD_DIR/build" && cd "$_"
Expand Down
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) a
* 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.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ Installation instructions for installing from source can be found [here]( doc/vi

#### Posting Issues

1. Read [CONTRIBUTING.md](https://github.com/roboticslab-uc3m/vision/blob/master/CONTRIBUTING.md)
1. Read [CONTRIBUTING.md](CONTRIBUTING.md)
2. [Post an issue / Feature request / Specific documentation request](https://github.com/roboticslab-uc3m/vision/issues)

#### Fork & Pull Request

1. [Fork the repository](https://github.com/roboticslab-uc3m/vision/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

## Status

[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/vision.svg?branch=develop)](https://travis-ci.com/roboticslab-uc3m/vision)
[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/vision.svg?branch=master)](https://travis-ci.com/roboticslab-uc3m/vision)

[![Coverage Status](https://coveralls.io/repos/roboticslab-uc3m/vision/badge.svg)](https://coveralls.io/r/roboticslab-uc3m/vision)

Expand Down

0 comments on commit bb6a357

Please sign in to comment.