I have a Android Studio project and when I make changes to the project I commit the whole project to the version control. Now when I want to checkout the latest version from my version control on another device, Android Studios has problems opening, building and running the application. So my question is: Which files should I commit (or Ignore) in order to checkout.
Also, when two persons on different devices work on the same file and they commit their work. Can the files be merged?