Home

Git Pull

1. Before starting to work on the code, fetch origin from the master branch and pull on the GitHub desktop application.

   The command line code for doing the equivalent should look like this (linux)

   cd where_you_store_your_files

   git pull origin master

(Have not tested this) A good resource is found here.

Git pull fetches and merges with the origin branch, master.

If you do not want to do this, use git fetch instead.

Git Fetch

1. Work on your local branch, making all the changes you need.
2. Commit your changes by staging them on the github desktop application or the atom github panel. Create a detailed explanation of the changes so that issues can be tracked.
3. Push/publish your work to your branch.
4. Once you have pushed all the changes you want to make, create a pull request. Again, be very detailed with the changes you made.
5. The owner of the website repository will then review the changes you made before merging your branch into master. You can continue to work on your branch in the meantime, and repeat the process when changes are made.

Publishing

Only applies to owner.

1. Fetch origin from github.
2. Connect to the school VPN before attempting to access the server.
3. Using Cyberduck or another SSH client of choice, connect to the server at web.physics.ucsb.edu and login with the UDIP access information.
4. Upload files that have changed since the last server update, as necessary.