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

handling conflicting strands in merge #15

Open
diekhans opened this issue Jun 20, 2024 · 0 comments
Open

handling conflicting strands in merge #15

diekhans opened this issue Jun 20, 2024 · 0 comments

Comments

@diekhans
Copy link
Owner

If a bad alignment causes a conflict strand, the first conflict found is discarded with a warning.

This should really keep the majority, but it requires some restructuring

see test case testStrandConflictMerge

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

No branches or pull requests

1 participant