| Chunk |
|---|
| Conflicting content |
|---|
graphics().rootLayer().add(goalBarLayer); graphics().rootLayer().add(levelStatusLayer); keyboard().setListener(this); <<<<<<< HEAD pointer().setListener(this); ======= pointer().setListener(this); >>>>>>> aa256a007b7505a07bbe4e07e2862012afc81e3e } @Override |
| Solution content |
|---|
graphics().rootLayer().add(goalBarLayer); graphics().rootLayer().add(levelStatusLayer); keyboard().setListener(this); pointer().setListener(this); } @Override |
| File |
|---|
| LevelScene.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void onDetach() {
graphics().rootLayer().remove(bgLayer);
<<<<<<< HEAD
graphics().rootLayer().remove(demoLayer);
=======
graphics().rootLayer().remove(demoLayer);
pointer().setListener(null);
keyboard().setListener(null);
>>>>>>> aa256a007b7505a07bbe4e07e2862012afc81e3e
}
} |
| Solution content |
|---|
@Override
public void onDetach() {
graphics().rootLayer().remove(bgLayer);
graphics().rootLayer().remove(demoLayer);
graphics().rootLayer().remove(demoLayer);
pointer().setListener(null);
keyboard().setListener(null);
}
} |
| File |
|---|
| LevelSelectScene.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method invocation |