| Chunk |
|---|
| Conflicting content |
|---|
@Before
public void landOnAnother() {
<<<<<<< HEAD
board = new Board("" +
"...\n" +
"...\n" +
".X.\n");
=======
board.drop(new Block('X'));
board.tick();
board.tick();
board.tick();
assertEquals("" +
"...\n" +
"...\n" +
".X.\n", board.toString());
assertFalse(board.hasFalling());
>>>>>>> 1756f47959805475e81ad7cef43f3eb023682d84
board.drop(new Block('Y'));
board.tick(); |
| Solution content |
|---|
@Before
public void landOnAnother() {
board = new Board("" +
"...\n" +
"...\n" +
".X.\n");
board.drop(new Block('Y'));
board.tick(); |
| File |
|---|
| FallingBlocksTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
@Before
public void landOnAnother() {
<<<<<<< HEAD
board = new Board("" +
=======
board.drop(Tetromino.T_SHAPE);
board.tick();
board.tick();
board.tick();
board.tick();
board.tick();
assertEquals("" +
>>>>>>> 1756f47959805475e81ad7cef43f3eb023682d84
"........\n" +
"........\n" +
"........\n" + |
| Solution content |
|---|
@Before
public void landOnAnother() {
board = new Board("" +
"........\n" +
"........\n" +
"........\n" + |
| File |
|---|
| FallingPiecesTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
"........\n" +
"........\n" +
"....T...\n" +
<<<<<<< HEAD
"...TTT..\n");
=======
"...TTT..\n", board.toString());
assertFalse(board.hasFalling());
>>>>>>> 1756f47959805475e81ad7cef43f3eb023682d84
board.drop(PIECE);
board.tick(); |
| Solution content |
|---|
"........\n" +
"........\n" +
"....T...\n" +
"...TTT..\n");
board.drop(PIECE);
board.tick(); |
| File |
|---|
| FallingPiecesTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |