On Oct 12, 2009, at 7:01 PM, Kees Hink wrote:

Merging the branch for PLIP 9310 into the 4.0 branch for CMFPlone, i ran into a conflict i wasn't able to resolve: http://pastie.org/ 652138 The bottom line is, 'svn resolve --accept working' doesn't resolve that last conflict.


Does anyone know how to avoid this? esteele suggested merging changeset by changeset, that's a lot of changesets. (Though I guess i could try and go straight to the changeset which deletes the misbehaving file.)

(I have subversion 1.6, I'll have a colleague with 1.5 have a go as well.)

Kees


I think http://dev.plone.org/plone/changeset/28275 where you merged in changes from 4.0 head is your problem. If you skip over this one, it should be a little more manageable.

Eric

_______________________________________________
Framework-Team mailing list
Framework-Team@lists.plone.org
http://lists.plone.org/mailman/listinfo/framework-team

Reply via email to