Projects >> mongo-java-driver >>b233ad17daeb0d1161dddbdedf3c55219b3c81d6

Chunk
Conflicting content 
package com.mongodb;

<<<<<<< HEAD
import org.mongodb.FieldSelectorDocument;
=======
import org.mongodb.annotations.NotThreadSafe;
>>>>>>> c1a126d36112e37909fe84134de0cb14689fe2dc
import org.mongodb.MongoCollection;
import org.mongodb.MongoCursor;
import org.mongodb.QueryFilterDocument;
Solution content 
package com.mongodb;

import org.mongodb.FieldSelectorDocument;
import org.mongodb.annotations.NotThreadSafe;
import org.mongodb.MongoCollection;
import org.mongodb.MongoCursor;
import org.mongodb.QueryFilterDocument;
File
DBCursor.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
package org.mongodb;

<<<<<<< HEAD
import org.bson.util.annotations.ThreadSafe;
=======
import org.mongodb.annotations.ThreadSafe;
import org.mongodb.operation.MongoFind;
import org.mongodb.operation.MongoFindAndRemove;
import org.mongodb.operation.MongoFindAndReplace;
import org.mongodb.operation.MongoFindAndUpdate;
import org.mongodb.operation.MongoInsert;
import org.mongodb.operation.MongoRemove;
import org.mongodb.operation.MongoReplace;
import org.mongodb.operation.MongoSave;
import org.mongodb.operation.MongoUpdate;
import org.mongodb.result.InsertResult;
import org.mongodb.result.RemoveResult;
import org.mongodb.result.UpdateResult;
>>>>>>> c1a126d36112e37909fe84134de0cb14689fe2dc

// TODO: add these
// update
Solution content 
package org.mongodb;

import org.mongodb.annotations.ThreadSafe;
import org.mongodb.operation.MongoFind;
import org.mongodb.operation.MongoFindAndRemove;
import org.mongodb.operation.MongoFindAndReplace;
import org.mongodb.operation.MongoFindAndUpdate;
import org.mongodb.operation.MongoInsert;
import org.mongodb.operation.MongoRemove;
import org.mongodb.operation.MongoReplace;
import org.mongodb.operation.MongoSave;
import org.mongodb.operation.MongoUpdate;
import org.mongodb.result.InsertResult;
import org.mongodb.result.RemoveResult;
import org.mongodb.result.UpdateResult;

// TODO: add these
// update
File
MongoCollection.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.mongodb;

<<<<<<< HEAD
=======
import org.mongodb.annotations.NotThreadSafe;
import org.mongodb.operation.GetMore;
import org.mongodb.operation.MongoFind;
import org.mongodb.operation.MongoKillCursor;
import org.mongodb.result.QueryResult;
>>>>>>> c1a126d36112e37909fe84134de0cb14689fe2dc
import org.mongodb.result.ServerCursor;

import java.io.Closeable;
Solution content 
package org.mongodb;


import org.mongodb.result.ServerCursor;

import java.io.Closeable;
File
MongoCursor.java
Developer's decision
Version 1
Kind of conflict
Import