On 6/6/07, Ben Elliston <[EMAIL PROTECTED]> wrote:
On Wed, 2007-06-06 at 08:29 -0400, Diego Novillo wrote:
> You should not have conflicts in libjava. You may have botched a merger
> earlier. I never ran into this with the branches I've maintained. Try
> copying libjava out of trunk again.
Out of interest, what happens if you have svn file properties that are
changed in both branches? Will that lead to a merge conflict?
If by "file properties" you mean svn properties, then yes, it will
lead to a conflict that needs resolving.
