Projects >> mongo-java-driver >>dcbcde282e2afd67ba3e5431f6deebbb60602196

Chunk
Conflicting content
        ArrayList be = new ArrayList();
        ByteDecoder b;
<<<<<<< HEAD
        while( (b = ByteDecoder.get( _db, _db.getCollection( "test" ) )) != null && count < max ) {
=======
        while( (b = ByteDecoder.get( _db , null ) ) != null && count < max ) {
>>>>>>> 77a4afa76452cb27360324a229ec58ab8ecd3f73
            be.add( b );
            count++;
        }
Solution content
        ArrayList be = new ArrayList();
        ByteDecoder b;
        while( (b = ByteDecoder.get( _db , null ) ) != null && count < max ) {
            be.add( b );
            count++;
        }
File
ByteTest.java
Developer's decision
Version 2
Kind of conflict
While statement