Look at the git log using git log --graph
. In the commit message look at the Merge:
section to check to see which parent tree you want to keep in the revert.
Example commit message:
(This was a commit from a feature branch into develop branch. develop branch is on the right 7c6b236
develop on the left 8989ee0
)
commit 8f937c683929b08379097828c8a04350b9b8e183
Merge: 8989ee0 7c6b236
Author: Kirk James <kirk@enterprise.com>
Date: Wed Aug 17 22:49:41 2011 +0100