Current SVN revision (251) contains unmerged conflicts

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Checkout http://bulk-loader.googlecode.com/svn/trunk/
2. Note that src/br/com/stimuli/loading/lazyloaders contains svn merge files

What is the expected output? What do you see instead?
Conflicts shouldn't be committed in SVN; you should resolve them locally
before committing.  This especially holds true for a publicly available and
widely used library

What version of the product are you using? On what operating system?
SVN rev. 251

Please provide any additional information below.
Zip file (239) doesn't have this issue.

Original issue reported on code.google.com by tylera...@gmail.com on 20 Feb 2009 at 3:19

[GoogleCodeExporter]

Hi Tylerault.

Sure, that shouldn't be any merge files or conflicts on svn. I am pretty much 
aware of how svn works. If 
something like this would exist, it would be a mishap.
But I can't find what you are referencing. Can you please pinpoint url / line 
numbers?

Where are the merge files?
http://code.google.com/p/bulk-loader/source/browse/#svn/trunk/src/br/com/stimuli
/loading/lazyloaders

Thanks

Original comment by debert on 21 Feb 2009 at 3:47

[GoogleCodeExporter]

My apologies, this must have been a local issue (though I can't understand how 
with a
fresh checkout into an empty directory).

Checking out again I don't see the merge files at the same directory/revision.

Thanks for the BulkLoader.  It works well!

Original comment by tylera...@gmail.com on 21 Feb 2009 at 4:27

[GoogleCodeExporter]

Original comment by debert on 21 Feb 2009 at 4:39

• Changed state: Invalid