When you check out a merge commit during the output of git log, you will note its moms and dads shown on the line that starts with Merge: (the next line In such a case):– jstine Commented Sep 28, 2015 at 15:38 The challenge with this technique, is the fact When you've got a significant piece of code according to the file not current, Placing it