| Chunk |
|---|
| Conflicting content |
|---|
private native void nativeCloseReplication(long nativeReplicationPtr);
private native void nativeRollbackAndContinueAsRead(long nativePtr);
private native long[] nativeGetVersionID (long nativePtr);
<<<<<<< HEAD
private native void nativeAdvanceRead(long nativePtr, long nativeReplicationPtr);
private native void nativeAdvanceReadToVersion(long nativePtr, long nativeReplicationPtr,
long version, long index);
private native void nativePromoteToWrite(long nativePtr, long nativeReplicationPtr);
private native boolean nativeWaitForChange(long nativePtr);
private native void nativeWaitForChangeRelease(long nativePtr);
private native void nativeEnableWaitForChange(long nativePtr);
=======
private native void nativeAdvanceRead(long nativePtr);
private native void nativeAdvanceReadToVersion(long nativePtr, long version, long index);
private native void nativePromoteToWrite(long nativePtr);
>>>>>>> a910b48261374a96bafab65e5b43d5cc8897a1e2
} |
| Solution content |
|---|
private native void nativeCloseReplication(long nativeReplicationPtr);
private native void nativeRollbackAndContinueAsRead(long nativePtr);
private native long[] nativeGetVersionID (long nativePtr);
private native void nativeAdvanceRead(long nativePtr, long nativeReplicationPtr);
private native void nativeAdvanceReadToVersion(long nativePtr, long nativeReplicationPtr,
long version, long index);
private native void nativePromoteToWrite(long nativePtr, long nativeReplicationPtr);
private native boolean nativeWaitForChange(long nativePtr);
private native void nativeWaitForChangeRelease(long nativePtr);
private native void nativeEnableWaitForChange(long nativePtr);
private native void nativeAdvanceRead(long nativePtr);
private native void nativeAdvanceReadToVersion(long nativePtr, long version, long index);
private native void nativePromoteToWrite(long nativePtr);
} |
| File |
|---|
| SharedGroup.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method interface |