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 really need in the repository (e.g. a DLL dependency in a BIN folder for some legacy application that doesn’t do NuGet, or other package […]
Tag Archives: git
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, it is relatively easy to wire up a third party diff and merge tools to help. Setting up as a diff tool. You can download the Perforce Visual Merge Tool […]
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 download msysgit, a prerequisite for running Tortoise Git. (A the time of writing this was v1.8.3). For the installation, I mostly accepted all the default options. The only change […]
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 which files are modified and any files that are untracked, etc. Add a file to the repository: git add <filename> You can also replace filename with a […]
