Sports Competition Management Software with a modern and fast architecture. Java based backend with a RESTful JSON API and a HTML 5 client with a modern UI.
Copyright (C) 2015 Marcus Fihlon
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License along with this program. If not, see http://www.gnu.org/licenses/.
The saver is base on Java EE technology and provides high-performance, RESTful web services. Everything is tied together using a Maven build.
For the client we decided wo go with HTML5 and Google Polymer.
We'll use GitHub Pages for hosting our upcoming project website. We only need static content, so we decided to go with Hugo, a fast and modern static website engine. Our content will be written in Markdown syntax.
We use a Maven build to tie everything together. As a result this project is IDE independent (every state-of-the-art IDE should be able to import and/or use a Maven project). VersionEye is used to track out of date dependencies. To track our reaction time on issues and pull requests we use Issue Stats.
We use the GitFlow workflow for SportChef. You can read a really good explanation of GitFlow on the Blog of Vincent Driessen: A successful Git branching model
If you fork this repository, GitHub will not keep your fork in sync with this repository. You have to do it on your own.
- If not already done, add this repository as an upstream to your repository:
git remote add upstream https://github.com/McPringle/sportchef.git
- Verify that this repository was added successfully:
git remote -v
- Fetch branches and commits from this repository to your local repository:
git fetch upstream
- If you are not on your local develop branch, check it out:
git checkout develop
- Merge the changes from this repositories develop branch into your repository):
git merge upstream/develop
- Push your updated repository to your GitHub fork:
git push origin develop
If you want to merge changes from a different branch (e.g. master
, release
, etc), simply replace the branch name develop
in the above command line examples with the branch name, you want to merge.
- When I try to push, I get a
non-fast-forward updates were rejected
error.
Your local copy of a repository is out of sync with, or behind the upstream repository, you are pushing to. You must retrieve the upstream changes, before you are able to push your local changes.