We are using Unicorn 2.0.4 to serialize our forms (and other content). These files are then saved into our VSO Git repository. After editing several forms, with similar fields (The forms were originally duplicated) we have noticed that Git managed to mess the .item files, sometimes considering that a file has been renamed when it was actually added in one form and delete from other, pointing the content of the item file to a different item... Has anybody had this sort of issues? and managed to fix them? The side effect of this issues with item files and git is that if the developer committing the file doesn't realize that the actual commit is wrong, the next developer will mess its environment after synching back. I don't think it's related to wffm but we haven't noticed this issue elsewhere.
Following the history of a .item file (one field of a form) we can see:
Commit 1:
+path: /sitecore/system/Modules/Web Forms for Marketers/Website/..../Town
+parent: {78CD1992-7BD2-4AFE-9913-7AAC654B780B} +name: Town
and
Commit 2:
+database: master
+path: /sitecore/system/Modules/Web Forms for Marketers/Website/..../Address4
+parent: {78CD1992-7BD2-4AFE-9913-7AAC654B780B}
name: Address4