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

Better verify merge lesson #4

Open
Serchinastico opened this issue Oct 20, 2016 · 0 comments
Open

Better verify merge lesson #4

Serchinastico opened this issue Oct 20, 2016 · 0 comments
Labels
enhancement

Comments

@Serchinastico
Copy link
Contributor

Right now we are only checking that the branch has two parents. That means that merging that branch only once will be a valid result while we want to check that the user has tried to solve conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Serchinastico