Home

Digital Ocean - Working copy of the site. Not currently a git repo.

Github -

1. Open the local copy of the repo (documents/RailsProjects/christopherg) on the laptop or desktop with git gui.
2. Create a new local branch
3. Open git-bash in christopherg. git-fetch . git rebase origin/master
4. run Sync in aptana - Make sure the log etc folders are excluded (Right click on the folder, file transfer, cloak)
5. Look at the sync results to see if they make sense.
6. Make changes
7. If you create files, you can add them to the git tracking in git-gui with a control-t
8. Synch changes, run rake assets:precompile if required and sudo service unicorn restart (From the rails user)
9. If the changes are good, stage, commit and push the branch
10. Create a pull request and run a merge in Github.