Viewing posts from November, 2012

Merging git conflicts

Git merging confused me a lot when I first encountered it so here is my quick guide to merging. Do 'git pull origin master' often to minimise merging problems.

Australia: 07 3103 2894

International: +61 410 545 357