12-13-2012 07:38 AM
I tried a solution i found on the web, but it did not work.
(created a folder "info" in the ".git" subfolder, with a file ".attributes" and entered "*.qml diff=text merge=text"
I guess many developers use git, did anybody solve this?
12-13-2012 04:36 PM
same for me - no problems yet with Git and QML
12-14-2012 04:19 AM
12-14-2012 05:31 AM
I use git pull (from the command line), there is a conflict in a qml file, i open it in momentics and it does not merge anything, just shows the head revision on top and my own below.
I'm using Tower on OSX