Building is straight forward. Open up the project in Eclipse Neon and hit launch.
To submit changes, you must first do the following:
- Stash any changes and type git checkout master
- Type git branch branchname, where branchname is the name of your branch
- Create any changes, i.e new classes, functions.
- git add all of the files you want added to the commit.
- Run git commit and enter your commit message (Title first line, two newline characters then the description)
- Run git push -u origin branchname where branchname is the name of the branch you want to push to.
- Open a pull request on your github. Here we can review and make necessary changes before it is accepted into the master branch.
Firstly, you want to add an upstream remote by typing _git remote add upstream https://www.github.com/Palm-Studios2/Escape.git This only needs to be performed ONCE!
- Run git checkout master
- Now, run git fetch --all
- Finally, run git pull upstream/master to fetch from the master branch.
You can now create new branches. Old branches don't need to be updated (for the most part), to a. avoid conflicts and b. because they will be pulled into master.