conflicts

merge workflow

List all files that currently have merge conflicts. This is helpful during merge or rebase operations to quickly see which files need conflict resolution, without having to parse through the full output of git status.

Found at https://stackoverflow.com/a/11014518/4051181

Usage: git conflicts

CLI Command

git config --global alias.conflicts "!git ls-files --unmerged | cut -f2 | sort -u"

.gitconfig Snippet

[alias]
  conflicts = !git ls-files --unmerged | cut -f2 | sort -u