| Chunk |
|---|
| Conflicting content |
|---|
if (parentConfig != null) {
name = parentConfig.getName();
<<<<<<< HEAD
// If this contructor is called to clone an existing
// configuration, the parent of the parent should be stored.
// As of 2.1, there is still one single level of inheritence to
=======
// If this constructor is called to clone an existing
// configuration, the parent of the parent should be stored.
// As of 2.1, there is still one single level of inheritance to
>>>>>>> e59cb540dbd31d19cb0d2fdb7c62fc7005d8de4d
// worry about
parent = parentConfig.getParent() == null ? parentConfig : parentConfig.getParent();
} |
| Solution content |
|---|
if (parentConfig != null) {
name = parentConfig.getName();
// If this constructor is called to clone an existing
// configuration, the parent of the parent should be stored.
// As of 2.1, there is still one single level of inheritance to
// worry about
parent = parentConfig.getParent() == null ? parentConfig : parentConfig.getParent();
} |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
// if(!baseCfg.isExtensionConfig) // cloneChildren = true; <<<<<<< HEAD // If this contructor is called to clone an existing // configuration, the parent of the cloning config should be stored. ======= // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. >>>>>>> e59cb540dbd31d19cb0d2fdb7c62fc7005d8de4d parent = baseCfg.isExtensionConfig || baseCfg.getParent() == null ? baseCfg : baseCfg.getParent(); // Copy the remaining attributes |
| Solution content |
|---|
// if(!baseCfg.isExtensionConfig) // cloneChildren = true; // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. parent = baseCfg.isExtensionConfig || baseCfg.getParent() == null ? baseCfg : baseCfg.getParent(); // Copy the remaining attributes |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
if(!cloneConfig.isExtensionConfig) cloneChildren = true; <<<<<<< HEAD // If this contructor is called to clone an existing // configuration, the parent of the cloning config should be stored. ======= // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. >>>>>>> e59cb540dbd31d19cb0d2fdb7c62fc7005d8de4d parent = cloneConfig.isExtensionConfig || cloneConfig.getParent() == null ? cloneConfig : cloneConfig.getParent(); parentId = parent.getId(); |
| Solution content |
|---|
if(!cloneConfig.isExtensionConfig) cloneChildren = true; // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. parent = cloneConfig.isExtensionConfig || cloneConfig.getParent() == null ? cloneConfig : cloneConfig.getParent(); parentId = parent.getId(); |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |