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 11, 2020
1 parent 3cdafd8 commit 6719324
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Information of how to launch or configure it:
1. [Speech recognition](programs/speechRecognition/README.md)
2. [Espeak](libraries/YarpPlugins/Espeak/README.md)

Read the [development manual](https://github.com/roboticslab-uc3m/speech/blob/develop/doc/speech-development-manual.md) if you want to build a new language model
Read the [development manual](doc/speech-development-manual.md) if you want to build a new language model

##### More examples:
To see how other programs call to `speechRecognition ` and `Espeak` and configure it by yarp, you can see this part of the [follow-me](https://github.com/roboticslab-uc3m/follow-me/blob/develop/programs/followMeDialogueManager/FollowMeDialogueManager.cpp#L10-L100) code.
To see how other programs call to `speechRecognition` and `Espeak` and configure it by yarp, you can see this part of the [follow-me](https://github.com/roboticslab-uc3m/follow-me/blob/master/programs/followMeDialogueManager/FollowMeDialogueManager.cpp#L10-L100) code.

## Contributing

Expand All @@ -29,14 +29,14 @@ To see how other programs call to `speechRecognition ` and `Espeak` and configu
#### Fork & Pull Request

1. [Fork the repository](https://github.com/roboticslab-uc3m/speech/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/speech.svg?branch=develop)](https://travis-ci.com/roboticslab-uc3m/speech)
[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/speech.svg?branch=master)](https://travis-ci.com/roboticslab-uc3m/speech)

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

Expand Down

0 comments on commit 6719324

Please sign in to comment.