How to Avoid Git Merge Conflicts and How I Almost Lost My Head
Several weeks ago, I had made some application changes to one of my customer's systems. Unfortunately, these changes did not have the desired end result; and »
Resolving Merge Conflicts with Git
For any developer working with a version control system like Git, at some point in your day-to-day workflow, you are going to run into merge conflicts. »
Feature Branch Workflow and Branch Merging with Git
I had my very first introduction to Git in 2012. While I worked on a development team of one, namely me, I did not really have »