menendez-oscar / projectorange

PorjectOrange

Project Orange

Author: Group Orange

Version: CS4250 (2014)

Website: https://github.com/salvador303/ProjectOrange

Requirements

Git

Help

man git <command>

Cloning/copying the repo to your machine

git clone < repo address >

Creating your own feature branch

Getting the latest base code.

git checkout develop

Create a new branch with the name feature/

git checkout -b feature/<something your working on>

Now your ready to make changes to the code.

Reveiew your changes, by comparing current and privious versions

For a specific file

git diff <name of file | path and name of file>

For all files

git diff

Creating a commit (saving your code)

When changes are complete, or you would like to save them in the repo

Stage all changes for commit

git add -A

Create a commit

git commit -m "<your message>"

Reviewing last commit

git log -1

Getting the branch Name

Get your branch name before you push, copy your branch name

git branch

Pushing to the repo

Push to the repo, you can paste your branch name from above

git push origin feature/<something your working on>

Create Pull Request

1. Go to the repo website, and click on pull request.
2. Click on, New pull request.
3. Add the teammebers to do a code reviews.
4. Submit, Done, or whatever it is.

Git Tutorial/links

Basic Git commands

https://confluence.atlassian.com/display/STASH/Basic+Git+commands

Tutorial on how to manipulate commits

http://pcottle.github.io/learnGitBranching/

Git flow

http://nvie.com/posts/a-successful-git-branching-model/

Pro Git

http://git-scm.com/book

Licence