Skip to content

Ensure that conflicts are staged and never ignored #1062

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

Merged
merged 4 commits into from
Jun 11, 2015
+109 −3

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.