[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39991] trunk/blender: Merging r39693 through r39989 from vgroup_modifiers branch into trunk.

Αντώνης Ρυακιωτάκης kalast at gmail.com
Thu Sep 8 12:04:26 CEST 2011

I once had a property conflict when merging trunk into onion. After googling
a bit on it it looked like a strange issue when files got added twice or
something. To resolve this issue I simply did a recursive svn resolve
manually. In your case I would choose my 'own' version over 'theirs' to keep
the merge info.

More information about the Bf-committers mailing list