inger inger - 1 year ago 74
Git Question

What's the simplest way to git a list of conflicted files?

I just need a plain list of conflicted files.

Is there anything simpler than:

git ls-files -u | cut -f 2 | sort -u


git ls-files -u | awk '{print $4}' | sort | uniq


I guess I could set up a handy alias for that, however was wondering how pros do it. I'd use it to write shell loops e.g. to auto-resolve conflict etc.. Maybe replace that loop by plugging into mergetool.cmd?

Answer Source
git diff --name-only --diff-filter=U
Recommended from our users: Dynamic Network Monitoring from WhatsUp Gold from IPSwitch. Free Download