DeliveryProject

PLEASE, remember to create a new branch for any changes. Never start working on the master branch.

INSTALL Sublime Text 2

DO NOT touch the index.php file, that is there to make heroku work.

To view page locally:

1. Right click anywhere on text interface on sublime (while viewing html file)
2. Select 'Copy File Path'
3. Paste into web browser
4. Reload the page everytime you make changes

Remote Server

Our remote server is located here: https://limitless-ravine-7258.herokuapp.com/ (this can only be pushed to by Arjit, let me know if you'd like to push something to this and I'll do it for you)

GIT CONTROLS:

To clone repo (only have to do first time): git clone https://github.com/arjitj2/DeliveryProject.git

To check current branch and list existing branches: git branch

To switch to existing branch: git checkout NAMEOFBRANCH

To check changes to current branch since last commit: git status

To prepare changes since last commit for a new commit: git add -A

To commit changes: git commit -m 'NAMEOFCOMMIT'

To push current branch to git repo (first time on each branch): git push --set-upstream origin NAMEOFBRANCH

To push new commits on current branch to git repo: git push

To delete local branch (make sure you're on a different branch): git branch -D NAMEOFBRANCH

IMPORTANT! Do the following on the master branch every time before creating new branch:

To pull changes to current branch from GitHub repo: git pull

To start and switch to new branch (always do this while on the master branch): git checkout -b NAMEOFBRANCH

Submitting Branches for Review

(Remember, this is for finished products. Do not do this until it has been tested and probably looked at by someone else first)

1. Make sure any changes to the branch locally have been added, committed, and pushed up to github
2. Go to the GitHub page for the repository
3. Press the branches button under the repo description
4. On the branch you'd like to submit, press 'New pull request'
5. On this page, you can scroll down for an overview of changes made in your branch. If satisfied, click the green 'Create pull request' button
6. IMPORTANT!!! Do NOT click anything on the subsequent screen. Now that your request has been submitted, I will take a look at it. Exit the tab and wait until I contact you