Git_List-Conflicts
#Lister les conflit git ls-files -u | cut -f 2 | sort -u #or git ls-files -u | awk '{print $4}' | sort | uniq #Create an Alias for it git config --global alias.conflicts '!git ls-files -u | cut -f 2 | sort -u'