XChange
XChange copied to clipboard
Survery for merge conflicts in commit afbafeb3fbc52f9f0aa12ee0f84de31069237c4a
Hello Everyone, I'm conducting a research experiment with open source repositories on Github about merge conflicts. Our script detect merge conflicts in https://github.com/knowm/XChange/commit/afbafeb3fbc52f9f0aa12ee0f84de31069237c4a. If possible, may I ask for the committer to complete a quick survey. I appreciate your valuable feedback.
Left version:
public class HuobiCurrency {
private String chain;
@@ -17,7 +19,7 @@ public class HuobiCurrency {
private String minWithdrawAmt;
private int numOfConfirmations;
private int numOfFastConfirmations;
- private String transactFeeWithdraw;
+ private BigDecimal transactFeeWithdraw;
private String withdrawFeeType;
private int withdrawPrecision;
private String withdrawQuotaPerDay;
Right version:
public class HuobiCurrency {
- private String chain;
- private String displayName;
- private String baseChain;
- private String baseChainProtocol;
- private boolean isDynamic;
- private String depositStatus;
- private String maxTransactFeeWithdraw;
- private String maxWithdrawAmt;
- private String minDepositAmt;
- private String minTransactFeeWithdraw;
- private String minWithdrawAmt;
- private int numOfConfirmations;
- private int numOfFastConfirmations;
- private String transactFeeWithdraw;
- private String withdrawFeeType;
- private int withdrawPrecision;
- private String withdrawQuotaPerDay;
- private String withdrawQuotaPerYear;
- private String withdrawQuotaTotal;
- private String withdrawStatus;
+ private final String chain;
+ private final String displayName;
+ private final String baseChain;
+ private final String baseChainProtocol;
+ private final boolean isDynamic;
+ private final String depositStatus;
+ private final String maxTransactFeeWithdraw;
+ private final String maxWithdrawAmt;
+ private final String minDepositAmt;
+ private final String minTransactFeeWithdraw;
+ private final String minWithdrawAmt;
+ private final int numOfConfirmations;
+ private final int numOfFastConfirmations;
+ private final BigDecimal transactFeeWithdraw;
+ private final String withdrawFeeType;
+ private final int withdrawPrecision;
+ private final String withdrawQuotaPerDay;
+ private final String withdrawQuotaPerYear;
+ private final String withdrawQuotaTotal;
+ private final String withdrawStatus;
Child version:
public class HuobiCurrency {
- private String chain;
- private String displayName;
- private String baseChain;
- private String baseChainProtocol;
- private boolean isDynamic;
- private String depositStatus;
- private String maxTransactFeeWithdraw;
- private String maxWithdrawAmt;
- private String minDepositAmt;
- private String minTransactFeeWithdraw;
- private String minWithdrawAmt;
- private int numOfConfirmations;
- private int numOfFastConfirmations;
- private String transactFeeWithdraw;
- private String withdrawFeeType;
- private int withdrawPrecision;
- private String withdrawQuotaPerDay;
- private String withdrawQuotaPerYear;
- private String withdrawQuotaTotal;
- private String withdrawStatus;
+ private final String chain;
+ private final String displayName;
+ private final String baseChain;
+ private final String baseChainProtocol;
+ private final boolean isDynamic;
+ private final String depositStatus;
+ private final String maxTransactFeeWithdraw;
+ private final String maxWithdrawAmt;
+ private final String minDepositAmt;
+ private final String minTransactFeeWithdraw;
+ private final String minWithdrawAmt;
+ private final int numOfConfirmations;
+ private final int numOfFastConfirmations;
+ private final BigDecimal transactFeeWithdraw;
+ private final String withdrawFeeType;
+ private final int withdrawPrecision;
+ private final String withdrawQuotaPerDay;
+ private final String withdrawQuotaPerYear;
+ private final String withdrawQuotaTotal;
+ private final String withdrawStatus;
Merge conflicts with git-merge:
public class HuobiCurrency {
<<<<<<< HEAD
private String chain;
private String displayName;
private String baseChain;
private String baseChainProtocol;
private boolean isDynamic;
private String depositStatus;
private String maxTransactFeeWithdraw;
private String maxWithdrawAmt;
private String minDepositAmt;
private String minTransactFeeWithdraw;
private String minWithdrawAmt;
private int numOfConfirmations;
private int numOfFastConfirmations;
private BigDecimal transactFeeWithdraw;
private String withdrawFeeType;
private int withdrawPrecision;
private String withdrawQuotaPerDay;
private String withdrawQuotaPerYear;
private String withdrawQuotaTotal;
private String withdrawStatus;
=======
private final String chain;
private final String displayName;
private final String baseChain;
private final String baseChainProtocol;
private final boolean isDynamic;
private final String depositStatus;
private final String maxTransactFeeWithdraw;
private final String maxWithdrawAmt;
private final String minDepositAmt;
private final String minTransactFeeWithdraw;
private final String minWithdrawAmt;
private final int numOfConfirmations;
private final int numOfFastConfirmations;
private final BigDecimal transactFeeWithdraw;
private final String withdrawFeeType;
private final int withdrawPrecision;
private final String withdrawQuotaPerDay;
private final String withdrawQuotaPerYear;
private final String withdrawQuotaTotal;
private final String withdrawStatus;
>>>>>>> 60a4f8ca73345c5864fbd30248cdcaa4785f0031
Question: The edits from left side and right side can co-exist. What is the developer's concern to only keep edit from right version?