-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
Change default behaviour for conflicts #83
Comments
I don't think you need to set the default to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
All conflicts should be displayed as changes form head. For conflicts which do not have separate configuration If there is conflict on update, then HEAD value should be in
merged
and update should be put as conflict. So when curator reject all conflicts only HEAD values should be left. This will require to set default fallback conflict strategy to KEEP_HEAD.All conflicts which we are ignoring (ones from
conflict_filters
) should stay with HEAD values if they are not configured differently.The text was updated successfully, but these errors were encountered: