Is there a way to show all conflicting files in Android Studio? I am thinking of some view/list that will only show the conflicting ones.
Currently I am finding them manually by looking into terminal output after running git merge and opening the ones that were not auto-merged one by one.