What's the simplest way to list conflicted files in Git?
-
28-09-2019 - |
문제
I just need a plain list of conflicted files.
Is there anything simpler than:
git ls-files -u | cut -f 2 | sort -u
or:
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
?
해결책
git diff --name-only --diff-filter=U
다른 팁
Trying to answer my question:
No, there doesn't seem to be any simpler way than the one in the question, out of box.
After typing that in too many times, just pasted the shorter one into an executable file named 'git-conflicts', made accessible to git, now I can just:
git conflicts
to get the list I wanted.
Update: as Richard suggests, you can set up an git alias, as alternative to the executable
git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'
An advantage of using the executable over the alias is that you can share that script with team members (in a bin dir part of the repo).
git diff --check
will show the list of files containing conflict markers including line numbers.
For example:
> git diff --check
index-localhost.html:85: leftover conflict marker
index-localhost.html:87: leftover conflict marker
index-localhost.html:89: leftover conflict marker
index.html:85: leftover conflict marker
index.html:87: leftover conflict marker
index.html:89: leftover conflict marker
Here is a fool-proof way:
grep -H -r "<<<<<<< HEAD" /path/to/project/dir
git status
displays "both modified" next to files that have conflicts instead of "modified" or "new file", etc
git status --short | grep "^UU "
This works for me:
git grep '<<<<<<< HEAD'
or
git grep '<<<<<<< HEAD' | less -N
you may hit git ls-files -u
on your command line it lists down files with conflicts
Maybe this has been added to Git, but the files that have yet to be resolved are listed in the status message (git status) like this:
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: syssw/target/libs/makefile
#
Note that this is the Unmerged paths section.
If you attempt to commit, and if there are conflicts, then git will give you the list of the currently unresolved conflicts... but not as a plain list. This is usually what you want when working interactively because the list gets shorter as you fix the conflicts.
Assuming you know where your git root directory, ${GIT_ROOT}, is, you can do,
cat ${GIT_ROOT}/.git/MERGE_MSG | sed '1,/Conflicts/d'
I've always just used git status
.
can add awk
at the end to get just the file names
git status -s | grep ^U | awk '{print $2}'
My 2 cents here (even when there are a lot of cool/working responses)
I created this alias in my .gitconfig
[alias]
...
conflicts = !git diff --name-only --diff-filter=U | grep -oE '[^/ ]+$'
which is going to show me just the names of the files with conflicts... not their whole path :)
Here's what I use to a list modified files suitable for command line substitution in bash
git diff --numstat -b -w | grep ^[1-9] | cut -f 3
To edit the list use $(cmd)
substitution.
vi $(git diff --numstat -b -w | grep ^[1-9] | cut -f 3)
Doesn't work if the file names have spaces. I tried to use sed
to escape or quote the spaces and the output list looked right, but the $()
substitution still did not behave as desired.
slight variation of Charles Bailey's answer that gives more information:
git diff --name-only --diff-filter=U | xargs git status
As highlighted in other answer(s) we can simply use command git status and then look for files listed under Unmerged paths: