| Chunk |
|---|
| Conflicting content |
|---|
-1000, 0, 0.9f,
{
if (firstTime)
{
<<<<<<< HEAD
obstacleDataJumper[i] = new Obstacle(-1000, 0, 0.9f, obstacleJumperWidth, obstacleJumperHeight, 'j');
=======
obstacleDataJumper[i] =
new Obstacle(
obstacleJumpImg.getWidth(), obstacleJumpImg.getHeight(), 'j');
>>>>>>> cb1734d525fd8a862f3a785cf415cd0e4ca972ce
renderer.addMesh(obstacleDataJumper[i]);
obstacleDataJumper[i].loadBitmap(obstacleJumpImg);
} |
| Solution content |
|---|
{
if (firstTime)
{
obstacleDataJumper[i] = new Obstacle(-1000, 0, 0.9f, obstacleJumperWidth, obstacleJumperHeight, 'j');
renderer.addMesh(obstacleDataJumper[i]);
obstacleDataJumper[i].loadBitmap(obstacleJumpImg);
} |
| File |
|---|
| Level.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Array access |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
Log.e("debug" , "dpi: " + metrics.densityDpi);
Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
<<<<<<< HEAD
width = display.getWidth();
height = display.getHeight();
=======
width= display.getWidth();
height= Math.abs(rectgle.top - rectgle.bottom);
>>>>>>> cb1734d525fd8a862f3a785cf415cd0e4ca972ce
if(Settings.RHDEBUG)
Log.d("debug", "displaywidth: " + width + ", displayheight: " + height); |
| Solution content |
|---|
Log.e("debug" , "dpi: " + metrics.densityDpi);
Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
width= display.getWidth();
height= Math.abs(rectgle.top - rectgle.bottom);
if(Settings.RHDEBUG)
Log.d("debug", "displaywidth: " + width + ", displayheight: " + height); |
| File |
|---|
| main.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
if(Settings.RHDEBUG)
long currentTimeTaken=0;
long starttime = 0;
<<<<<<< HEAD
Log.d("debug", "run method befor while");
=======
// long debugTime = System.currentTimeMillis(); // FIXME DEBUG TIME FOR VIDEO CAPTURE
>>>>>>> cb1734d525fd8a862f3a785cf415cd0e4ca972ce
while(isRunning){
starttime= System.currentTimeMillis(); |
| Solution content |
|---|
long starttime = 0;
long currentTimeTaken=0;
if(Settings.RHDEBUG) Log.d("debug", "run method befor while");// long debugTime = System.currentTimeMillis(); // FIXME DEBUG TIME FOR VIDEO CAPTURE
while(isRunning){
starttime= System.currentTimeMillis(); |
| File |
|---|
| main.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Comment |
| If statement |