Obviously the alterations made in C and D still can conflict with what was performed by any of your x, but that is just a standard merge conflict.The approved answer and Another responses display how to revert a merge commit using the git revert command. Even so, there was some confusion concerning the mother or father commits. This article aims to