remains in conflict android studio code example Example: svn node remains in conflict svn resolved <PATH>