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

Change ADD_BACK_TO_HEAD conflict to generate delete patch #84

Open
pazembrz opened this issue Jul 29, 2020 · 0 comments
Open

Change ADD_BACK_TO_HEAD conflict to generate delete patch #84

pazembrz opened this issue Jul 29, 2020 · 0 comments

Comments

@pazembrz
Copy link
Contributor

When UPDATE removes something from HEAD json_merger generates ADD_BACK_TO_HEAD conflict. Now it's just interpreted as it is so in merged value is absent and in patch we have an add of HEAD value, but we want it to work in opposite way. So in merged we should have value from HEAD and patch should be a delete.
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
2 participants
@drjova @pazembrz