| Chunk |
|---|
| Conflicting content |
|---|
return new Chalmrest(context);
case IBankTypes.TRUSTBUDDY:
case IBankTypes.MARGINALEN:
return new Marginalen(context);
<<<<<<< HEAD
return new TrustBuddy(context);
case IBankTypes.BRUMMER_KF:
return new BrummerKF(context);
=======
case IBankTypes.SVENSKASPEL:
return new SvenskaSpel(context);
case IBankTypes.EASYCARD:
return new EasyCard(context);
case IBankTypes.APPEAKPOKER:
return new AppeakPoker(context);
>>>>>>> 0bd3fff733d1e98bcfba523175c6bcd93a08a222
default:
throw new BankException("BankType id not found.");
} |
| Solution content |
|---|
return new Chalmrest(context);
case IBankTypes.MARGINALEN:
return new Marginalen(context);
case IBankTypes.SVENSKASPEL:
return new SvenskaSpel(context);
case IBankTypes.EASYCARD:
return new EasyCard(context);
case IBankTypes.APPEAKPOKER:
return new AppeakPoker(context);
case IBankTypes.TRUSTBUDDY:
return new TrustBuddy(context);
case IBankTypes.BRUMMER_KF:
return new BrummerKF(context);
default:
throw new BankException("BankType id not found.");
} |
| File |
|---|
| BankFactory.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Case statement |
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
public static final int CHALMREST = 60;
public static final int MARGINALEN = 61;
public static final int AKELIUSSPAR = 62;
<<<<<<< HEAD
public static final int TRUSTBUDDY = 63;
public static final int BRUMMER_KF = 64;
=======
public static final int SVENSKASPEL = 63;
public static final int EASYCARD = 64;
public static final int APPEAKPOKER = 65;
>>>>>>> 0bd3fff733d1e98bcfba523175c6bcd93a08a222
} |
| Solution content |
|---|
public static final int CHALMREST = 60;
public static final int MARGINALEN = 61;
public static final int AKELIUSSPAR = 62;
public static final int SVENSKASPEL = 63;
public static final int EASYCARD = 64;
public static final int APPEAKPOKER = 65;
public static final int TRUSTBUDDY = 66;
public static final int BRUMMER_KF = 67;
} |
| File |
|---|
| IBankTypes.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |