Tag Archives: git

Use Vagrant With Git

Vagrant is a tool for managing virtual machines. By combining vagrant with git (and shared git repositories like github or bitbucket) it is possible to share machine configurations. This post explores how using vagrant with git works and some possible challenges with collaborating with vagrant machines. Sharing Virtual Machines Sharing virtual machine images can be… Read More »

Git/GitHub conflict resolution

I keep forgetting how to resolve conflicts in git. This stackoverflow question seems to explain things quite nicely. If there is a conflict git puts some lines in the conflicting file highlighting the conflict. You can open that file manually resolve the conflict. Manually resolving the conflict means editing the file to leave it as… Read More »

Git as backup

Backups are good. Version-controlled backups are better. After my scheduled backup managed to over-write the contents of an important matlab script I realised that I needed to incorporate version control into my backing up. http://codebetter.com/robconery/2009/12/15/using-git-as-a-backup-tool/is guide more comprehensive than I need for using git as a backup. The most important part is git add .… Read More »