Archive for 'Source Control'

Git Fetch and Merge instead of Pull

Great Explanation of Git Fetch and Merge and why you should do that instead of git pull.

Perforce corrupts Scripts

On windows, I am mapping a linux drive. So in Perforce, when I do a perforce sync, the files on linux will get updated. After doing this, vs doing a perforce sync on the command line on Linux itself, I noticed that the script/server and script/generate commands didn’t work without typing “ruby ” in front […]

Deploying a Rails App, with Git and Capistrano on BlueHost

Here I’ll make an attempt to describe how to create a rails app from scratch on your local machine, configure a private Git repository on BlueHost and use Capistrano to deploy the latest code from the private shared Git repository. Almost all of the steps below work, except I’m still unable to deploy the code […]

Git Commands Adding, Committing and Branching Cheatsheet

Here are a list of Git commands I want to remember for myself, mainly but I highly recommend that you bookmark this for future reference. Email yourself and friends the URL if you have to. I’ve come back to it multiple times myself. :) Store Your Name and Email for Commit Messages The following allows […]