Fixing a common problem with a Git MergePlease enter a commit message to explain why this merge is necessaryGitMergeCommitDec 1, 2012