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

Thu, 08 Sep 2011 03:04:37 -0700 

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.
_______________________________________________
Bf-committers mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-committers

Reply via email to