Android Studio Git-merge won't end after resolve conflict

Question

Android Studio Git-merge won't end after resolve conflict.

I pulled code from remote to my local branch and there are some conflicts and android studio ask me to witch code wanna keep or merge. so I decide all my code and select "accept your" and there is many new files.

but merge won't end and new file won't come to my local change panel. I also try this with "accept-theirs" and the result was same.

I always do this and result was OK but I don't know how to manage this issue and why this happens.

Answer 1

I had similar problem when I left some merge issues unprocessed. For me VCS -> GIT -> Resolve Conflicts helped.