Using Git and branches 2013-09-07 Sat 16:21 Git has really been giving me fits with its aggressive merge feature.… Read this article