Projects >> realm-java >>655498003ac3168d7005302c0db1a6ed66cf9259

Chunk
Conflicting content 
            for (int i = 0; i < personTable.size(); i++) {
                if (personTable.getString(fullNameIndex, i).equals("JP McDonald")) {
<<<<<<< HEAD
                    personTable.getUncheckedRowByIndex(i).getLinkList(petsIndex).add(petTable.add("Jimbo", "dog"));
=======
                    long rowIndex = petTable.addEmptyRow();
                    petTable.setString(nameColumn, rowIndex, "Jimbo");
                    petTable.setString(typeColumn, rowIndex, "dog");
                    personTable.getUncheckedRow(i).getLinkList(petsIndex).add(rowIndex);
>>>>>>> 379c743dcb8552c7272e656aaa6c46197be7a61d
                }
            }
            version++;
Solution content 
            for (int i = 0; i < personTable.size(); i++) {
                if (personTable.getString(fullNameIndex, i).equals("JP McDonald")) {
                    long rowIndex = petTable.addEmptyRow();
                    petTable.setString(nameColumn, rowIndex, "Jimbo");
                    petTable.setString(typeColumn, rowIndex, "dog");
                    personTable.getUncheckedRowByIndex(i).getLinkList(petsIndex).add(rowIndex);
                }
            }
            version++;
File
Migration.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    void advanceRead() {
        nativeAdvanceRead(nativePtr, nativeReplicationPtr);
<<<<<<< HEAD
    }

    void advanceRead(VersionID versionID) {
        nativeAdvanceReadToVersion(nativePtr, nativeReplicationPtr, versionID.version,
                versionID.index);
=======
>>>>>>> 379c743dcb8552c7272e656aaa6c46197be7a61d
    }

    void promoteToWrite() {
Solution content 
    void advanceRead() {
        nativeAdvanceRead(nativePtr, nativeReplicationPtr);
    }

    void advanceRead(VersionID versionID) {
        nativeAdvanceReadToVersion(nativePtr, nativeReplicationPtr, versionID.version,
                versionID.index);
    }

    void promoteToWrite() {
File
SharedGroup.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature