Tag: git
Tip of the day: Forcing a file in to your Git repository
Normally, you'll have a .gitignore file that defines what should not go into a git repository. If you find that there is a file or two that is ignored that you...
Linking Perforce Merge to Git
Git's built in Merge conflict resolution is awful. Although all the information is there it is difficult to use for all but the simplest of conflicts. Luckily,...
Getting Tortoise Git to work with GitHub repositories
In this post I’ll walk you through installing Tortoise Git in a way that allows it to interact easily with GitHub repositories. Download msysgit First off...
Git cheat sheet
Here is my little cheat sheet for working with git at the command line. Check the status of the current repository: git status This will return details of...
