Tag Archives: source control

Working with Branches in Git

Show all the branches git branch Create a new branch git branch my_experimental_feature Use that branch git checkout my_experimental_feature Pushing the new branch to a remote server git push origin my_experimental_feature Pulling that branch down on another machine git pull origin my_experimental_feature Listing all branches on other machine git branch -a Updating other machine git pull origin my_experimental_feature
Posted in Git | Also tagged , | Leave a comment

git checkout — file-in-question.oh-my

Problem: using git and one file, like your db/schema.rb, is out of whack with the latest branch. If you run git pull and you get a failed merge and no update. You can of course, edit the conflicts manually. But what if you’re confident that the latest schema.rb is correct? Instead of manually editing the [...]
Posted in Programming | Also tagged , | Leave a comment

the simple things with git

Git can track the file permissions on your source. This can be good, but for small projects on a webserver where permissions change from time to time, and permissions on development app don’t match or matter anyway, it’s often easier to just skip this check alltogether. For the application in question look in the .git [...]
Posted in Programming | Also tagged | Leave a comment