Hi. In some repos cloned with Studio 10.12.3 I see the file .git/.gitattributes containing only one line: *.mpr merge=studiopro According to the docs this file is ignored by Git. Why does Studio create it? If they want to avoid putting an attributes file under version control they should write this to: $GIT_DIR/info/attributes The file .gitattributes also exists in the work tree and its contents are: # # The following was added while migrating this app from SVN to Git # .gitignore merge=union Recently we're getting a lot of automatic commit messages ending with this text: # Conflicts: # Book Planning.mpr This does not prevent a successful rebase in Studio.
asked
ilya basin
1 answers
0
The situation is not entirely clear right now, but you are already in contact with our Support department.