Github app process for pulling and pushing code

Once you have the github repository setup in the github app, do the following to make changes to the code:

1. Open the repository, and select branches on the left menu
2. Switch to the master branch and pull the latest version of the code from the server (Repository > Pull or shift+command+P)

• Click the + icon on the right side of the master branch
• Enter a name for the branch you will be working on and click branch - name the branch based on the work you will be doing, ie: lane-link-module
• Use your editor of choice and make changes to any files you need to
• Once finished your changes, go back to the Github app and select the changes button on the left menu
• Review the changes, and when ready enter a commit message about the work you have done
• Select the synchronize button next to the commit button so it is selected, then click "Commit & Sync".
• Go back to the branches section on the left menu and merge your branch into the master branch - ie: lane-link-module > master
• Once you have merged, switch to the master branch
• Sync your version of the master branch with the github server by clicking "Sync Branch" in the top right corner of the app.
• Delete the branch you created earlier (ie. lane-link-module) by clicking the down arrow on the right side of the branch and clicking "Delete"

If someone has made changes to the same file you have been working on, you will get a conflict. Check out the following resources for dealing with conflicts:

• Video Tutorial: Resolving Conflicts with the GitHub App for Mac
• Basic Merging and Branching
• Git Book

Pushing to Production

First you need to setup the production branch on your computer. Use this as a guideline, but use "production" instead of "gh-pages".

To push to the production branch, run the following two commands:

 cd ~/Documents/github/institutional-framework
 make production