[OAK-1549] AbstractRebaseDiff incorrectly handles conflict in added nodes - ASF JIRA

Attach files

Attach Screenshot

Voters

Watch issue

Watchers

Create sub-task

Link

Clone

Update Comment Author

Replace String in Comment

Update Comment Visibility

Delete Comments

XML

Word

Printable

JSON

Details

Type: Bug
Status: Closed
Priority: Major
Resolution: Fixed
Affects Version/s: None
Fix Version/s: 0.19
Component/s: None
Labels:
None

Description

AbstractRebaseDiff#addExistingNode reports a conflict if a node of the same name is added to the parent. MicroKernel#rebase however specifies: "addExistingNode: A node has been added that is different from a node of them same name that has been added to the trunk.