Skip to content

Do not rollback branch state in case of a merge failure #21

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

Merged
merged 1 commit into from
Jul 29, 2025

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Jul 29, 2025

CC @RalfJung

Fixes: #18

@RalfJung
Copy link
Member

Without having tested it, this looks good :)

@Kobzol
Copy link
Member Author

Kobzol commented Jul 29, 2025

Tested it on miri now, seems to work fine.

@Kobzol Kobzol enabled auto-merge July 29, 2025 12:12
@Kobzol Kobzol merged commit 28a012f into main Jul 29, 2025
1 check passed
@Kobzol Kobzol deleted the merge-conflict branch July 29, 2025 12:16
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.

pull does not work when there are conflicts
2 participants