conflict status
From: Michael Wild <hidden>
Date: 2016-06-15 22:47:08
Hi all I'm merging two branches with a large number of conflicts. Fortunately, there are many modified/deleted conflicts (locally modified, remotely deleted), and I know that for those I want to pick the deleted version. However, I can't seem to motivate GIT into telling me for which of the conflicting files this is the case. I know that git-mergetool somehow extracts this information, but looking at the code, it seems to me that there must be an easier, user-level method of obtaining this information. Generally speaking, I would like to know for each file with a conflict what it's status is, similar to what SVN does: - locally modified/created/deleted/... - remotely modified/created/deleted/... Please excuse me if this is either trivial or has been answered many times before, but neither perusing the man-pages, nor asking google turned up anything remotely useful. Thanks for the help Michael