What s the simplest way to list conflicted files in Git

Question

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

User · Answer

Here is a fool-proof way    grep -H -r   lt  lt  lt  lt  lt  lt  lt  HEAD   path to project dir

User · Answer

The answer by Jones Agyemang is probably sufficient for most use cases and was a great starting point for my solution  For scripting in Git Bent  the git wrapper library I made  I needed something a bit more robust  I m posting the prototype I ve written which is not yet totally script-friendly Notes  The linked answer checks for  lt  lt  lt  lt  lt  lt  lt  HEAD which doesn t work for merge conflicts from using git stash apply which has  lt  lt  lt  lt  lt  lt  lt  Updated Upstream My solution confirms the presence of          amp   gt  gt  gt  gt  gt  gt  gt  The linked answer is surely more performant  as it doesn t have to do as much My solution does NOT provide line numbers  Print files with merge conflicts You need the str split line function from below    Root git directory dir  quot   git rev-parse --show-toplevel  quot    Put the grep output into an array  see below  str split line  quot   grep -r  quot   lt  lt  lt  lt  lt  lt  lt   quot   quot   dir   quot  files bn  quot   basename  quot   dir  quot   quot  for i in  quot   files     quot   do        Remove the matched string  so we re left with the file name       file  quot   sed -e  quot s   lt  lt  lt  lt  lt  lt  lt       quot   lt  lt  lt   quot   i  quot   quot         Remove the path  keep the project dir s name       fileShort  quot   file  quot   dir  quot   quot      fileShort  quot   bn   fileShort  quot         Confirm merge divider  amp  closer are present     c1   grep -c  quot          quot   quot   file  quot       c2   grep -c  quot   gt  gt  gt  gt  gt  gt  gt   quot   quot   file  quot       if    c1 -gt 0  amp  amp  c2 -gt 0     then         echo  quot   fileShort  has a merge conflict quot      fi done  Output projectdir file-name projectdir subdir file-name  Split strings by line function You can just copy the block of code if you don t want this as a separate function function str split line      for IFS  see https   stackoverflow com questions 16831429 when-setting-ifs-to-split-on-newlines-why-is-it-necessary-to-include-a-backspac IFS  quot   quot      declare -n lines  2     while read line  do         lines    quot   line  quot       done  lt  lt  lt   quot   1  quot

User · Answer

Assuming you know where your git root directory    GIT ROOT   is  you can do    cat   GIT ROOT   git MERGE MSG   sed  1  Conflicts d

User · Answer

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

User · Answer

As highlighted in other answer s  we can simply use command git status and then look for files listed under Unmerged paths

User · Answer

I would also suggest the following command if you are working on a local git repository or in a directory in which patch -p1 --merge  lt      was applied  grep -rnw   -e    lt  lt  lt  lt  lt  lt  lt

User · Answer

This works for me   git grep   lt  lt  lt  lt  lt  lt  lt  HEAD   or  git grep   lt  lt  lt  lt  lt  lt  lt  HEAD    less -N

User · Answer

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

User · Answer

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

User · Answer

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  lt file gt      as appropriate to mark resolution        both modified       syssw target libs makefile     Note that this is the Unmerged paths section

User · Answer

git diff --name-only --diff-filter U

User · Answer

Utility git wizard https   github com makelinux git-wizard counts separately unresolved conflicted changes  collisions  and unmerged files  Conflicts must be resolved manually or with mergetool  Resolved unmerged changes can me added and committed usually with git rebase --continue

User · Answer

slight variation of Charles Bailey s answer that gives more information   git diff --name-only --diff-filter U   xargs git status

User · Answer

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

User · Answer

git status displays  both modified  next to files that have conflicts instead of  modified  or  new file   etc

User · Answer

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

User · Answer

git diff --check   will show the list of files containing conflict markers including line numbers   For example    gt  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   source   https   ardalis com detect-git-conflict-markers

User · Answer

you may hit git ls-files -u on your command line it lists down files with conflicts

User · Answer

git status --short   grep   UU

[git] What's the simplest way to list conflicted files in Git?

Examples related to git

Examples related to git-merge

Examples related to git-merge-conflict