#Chronox TNM082 - Grupp A - Chronox Agilen is a project developed by a group of students at Linköpings University, coached by Combitech.

#Licence Chronox is licenced under the BSD licence

##Get started

###How to contribute This project uses git, and is currently hosted on Github at https://github.com/TobyPalmer/Agilen
Although a goal would be to have a perfect git history, multiple of the projects participants are not familiar with the complications of git. Something that can/will result in horrible git commits and amends.

If you do not have git setup properly, please follow the following guides
https://help.github.com/articles/set-up-git
https://help.github.com/articles/generating-ssh-keys

To fetch the repository to start developing
git clone git@github.com:TobyPalmer/Agilen.git

In order to start your own branch for development.
git checkout -b <feature to work on>

Or fork through Githubs interface.

##Workflow

Either ask to become a contributer, or send of a Pull Request. This is best done through the Github interface via your own branch/fork. Code reviews should be applied as Pull Requests through Github. This means that all features should be it's own branch which then will be merged into Master.
Master should at all time be runnable, which means that all code reviews should be run before being merged into master.

The general workflow for code reviewing is the following.

git pull origin master
git checkout <branch to work on>
<--All work is done-->
git commit -m "<Commit message>"
git merge master

After all that is done, apply for the Pull Request through Githubs interface, tag relevant people you want to review.

When the request has been granted, either you or the reviewer should be able to automatically merge the request through Githubs interface, if not, follow the following workflow.

git pull --all
git checkout master
git merge <branch to to merge>
<-- Fix the merge conflict -->
git commit -m "fixed merge conflict"
git push origin master