| Chunk |
|---|
| Conflicting content |
|---|
{
if (!snake.isDead())
{
<<<<<<< HEAD
GameState currentGameState = new GameState(board, snakes, metadata);
=======
>>>>>>> 860845cfa9aecdfab048144e673ef074f2695c22
BrainDecision bd = new BrainDecision(snake, currentGameState);
decisionThreads.put(snake, bd);
} |
| Solution content |
|---|
{
if (!snake.isDead())
{
GameState currentGameState = new GameState(board, snakes, metadata);
BrainDecision bd = new BrainDecision(snake, currentGameState);
decisionThreads.put(snake, bd);
} |
| File |
|---|
| Session.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
snake.placeOnBoard(snakePositions, Direction.NORTH); //~ TODO: A nicer way to determine starting direction. } <<<<<<< HEAD ======= updateGameState(); >>>>>>> 860845cfa9aecdfab048144e673ef074f2695c22 } /** |
| Solution content |
|---|
snake.placeOnBoard(snakePositions, Direction.NORTH); //~ TODO: A nicer way to determine starting direction. } } /** |
| File |
|---|
| Session.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |