| Chunk |
|---|
| Conflicting content |
|---|
getType("define type (BTREE number number %) of (btree,) >> \n" //
+ "BTREE 2 3 % = BTREE 4 6 %");
getTypeMustFail("define type (T1 number number %) of (t1,) >> \n" //
<<<<<<< HEAD
+ "define type (T2 number number %) of (t2,) >> \n" + "T1 2 3 % = T2 2 3 %");
=======
+ "define type (T2 number number %) of (t2,) >> \n" //
+ "T1 2 3 % = T2 2 3 %");
>>>>>>> 59e42e7b55d9c3d8fc5320567df45b0bcef23619
getTypeMustFail("define type (BTREE number number %) of (btree,) >> \n" //
+ "BTREE 2 3 % = BTREE \"a\" 6 %");
} |
| Solution content |
|---|
getType("define type (BTREE number number %) of (btree,) >> \n" //
+ "BTREE 2 3 % = BTREE 4 6 %");
getTypeMustFail("define type (T1 number number %) of (t1,) >> \n" //
+ "define type (T2 number number %) of (t2,) >> \n" //
+ "T1 2 3 % = T2 2 3 %");
getTypeMustFail("define type (BTREE number number %) of (btree,) >> \n" //
+ "BTREE 2 3 % = BTREE \"a\" 6 %");
} |
| File |
|---|
| FunCompilerTypeTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |