- Fork the repository on github.
- In the terminal, change your working directory to the openFrameworks root:
cd OF_ROOT/
- Clone the repository, filling in
GITHUB_USERNAME
with your Github user name.
git clone https://github.com/GITHUB_USERNAME/ARTTECH-3135.git
- Create a remote link to the main repository and call it upstream
git remote add https://github.com/SAIC-ATS/ARTTECH-3135.git
- To update your copy to the latest upstream ..
git pull upstream master
If, when updating your fork, you get a terminal screen that looks like:
Merge branch 'master' of https://github.com/SAIC-ATS/ARTTECH-3135
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
~
~
~
~
~
... it means that your git wants you to issue a commit message and the default terminal text editor is set to vim
. vim
is a powerful text editor, but not for the faint of heart. To exit out of that screen, you should use the following key sequence:
ESCAPE
, :
, w
, q
, ENTER
This will simply allow the merge to proceed with the default message.
If you would like to switch your default text editor to something simpler, like nano
, configure git like this:
git config --global core.editor "nano"
If you'd like to use a GUI based text editor, you can use something like Atom.io by following these instructions.
If you find errors or want to make contributions ...
- Install this repository as a contributor (see above).
- Create your feature branch (
git checkout -b my-new-feature
). - Commit your changes (
git commit -am 'Add some feature'
). - Push to the branch (
git push origin my-new-feature
). - Create new Pull Request.