Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Branch merge error: "Cannot read properties of undefined (reading root)" #274

Open
brollb opened this issue Apr 8, 2022 · 1 comment
Open

Branch merge error: "Cannot read properties of undefined (reading root)" #274

brollb opened this issue Apr 8, 2022 · 1 comment

Comments

@brollb
Copy link
Collaborator

brollb commented Apr 8, 2022

When running a plugin that created a node (which children and attributes but no pointers outside of base), it branched due to collaborative edits. This branch cannot be merged for some reason.
DeepinScreenshot_20220408144944

I couldn't find the base but grabbed a commit that should be about right. (It may not be the immediate predecessor but should be close.)

merge_err.zip
@brollb
Copy link
Collaborator Author

brollb commented Apr 9, 2022

base.zip

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@brollb