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

add 'no_conflicts' as compat option for merging non-conflicting data #996

Merged
merged 18 commits into from
Sep 15, 2016
+222 −23

We went looking everywhere, but couldn’t find those commits.

Sometimes commits can disappear after a force-push. Head back to the latest changes here.