How to work on this project?

Welcome to the JavaSketchPad wiki!

First follow basic git tutorial at http://ieng6.ucsd.edu/~cs15x/labs/lab5_cxvkjf/index.html.

###Before you make any changes, make a copy of the develop branch.

git clone by default clones the master branch, you need to get the develop branch, using the following command

$ git clone https://github.com/UCSDOalads/JavaSketchPad.git
$ cd JavaSketchPad
$ git branch -a
$ git checkout -b develop origin/develop

Now you are on the develop branch, before doing any work, create a new branch. Please do not edit file directly on develop branch, and your new branch should be directly pushed to the remote.

###Create a new branch by

$ git checkout -b addXXXXbyYYYY

where XXXX is the Changes you want to make and YYYY is your name.

You can verify that you created a new branch by

$ git branch

##Now you can work and commit on all files as you wish.

Before you submit to the remote server, verify that you saved all files by using

$ git status
On branch addXXXXbyYYYY
nothing to commit, working tree clean

You should see the above result.

###After you're done committing changes, push your local branch directly to remote using

$ git push origin addXXXXbyYYYY

Your code will go through a code review process by a reviewer.

After your code has been reviewed and merged to develop, you can update your local develop branch by

1. go back to develop branch.
2. pull changes from origin/develop.
3. delete the temporary branch you created.

$ git checkout develop
$ git pull origin develop
$ git branch -d addXXXXbyYYYY