git - Show all conflicting files in Android Studio GUI -


is there way show conflicting files in android studio? thinking of view/list show conflicting ones.

currently finding them manually looking terminal output after running git merge , opening ones not auto-merged 1 one.

you can merge branches option in android studio -> vcs -> git -> merge changes.

then files conflicts.

enter image description here

if close merge conflicts windows, can list of conflict files under vseriojn control tab.

enter image description here


Comments

Popular posts from this blog

php - Embed BBCode within itself not working -

three.js - how to load gltf in three JS -

sql server - T-SQL: Access DB objects in same schema without qualifying? -