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

fix: change order of edge case resolution #115

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Conversation

Balvajs
Copy link
Owner

@Balvajs Balvajs commented Oct 5, 2023

The no-owner edge case was resolved before force-push edge case. That doesn't make sense, because when there is a force-push, then the history can't be resolved and it can't be determined what changed and what didn't.
This PR gives the force-push case precedence, so it always resolves first.

Fixes the #95

@Balvajs Balvajs force-pushed the fix/edge-case-order branch from 67af27f to 3046545 Compare October 5, 2023 10:50
@Balvajs Balvajs marked this pull request as ready for review October 5, 2023 11:04
@Balvajs Balvajs merged commit 7895e47 into main Oct 5, 2023
5 checks passed
@Balvajs Balvajs deleted the fix/edge-case-order branch October 5, 2023 11:08
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.

1 participant