Steve Kargl writes:
 > Can someone explain why libjava *must* commit binary files to the
 > repository?  A merge of trunk to the fortran-experiments branch
 > generated 70 conflicts that I need to resolve.  This is a complete
 > waste of time that would have been spent towards cutting a diff
 > of the branch against trunk for patch submission!

In addition to David Daney's comments, I don't really understand why
you've got conflicts on your branch.  You won't have changed anything
in libjava/ there, so the problem shouldn't arise.

Andrew.

Reply via email to