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.

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

Fixes #7: merging an ancestor #63

Closed

Conversation

kheyse-werk
Copy link

@kheyse-werk kheyse-werk commented Mar 2, 2018

Fixes #7
Also fixes #49

@kheyse-werk kheyse-werk changed the title fix #7: merging an ancestor Fixes #7: merging an ancestor Mar 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Javascript error with "no-ff" merge git merge on up-to-date branch generates a bogus commit
1 participant