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

mapdiffbot failing due to merge when there is no merge #34

Open

ZeWaka opened this issue Jun 1, 2024 · 1 comment

Member

ZeWaka commented Jun 1, 2024

0: Fetching and constructing diffs
1: Merging
2: Trying to merge base into head
3: 1 uncommitted change would be overwritten by merge; class=Merge (22); code=Conflict (-13)

https://github.com/goonstation/goonstation/pull/19258/checks?check_run_id=25687782375

The text was updated successfully, but these errors were encountered:

Member

AffectedArc07 commented Jun 1, 2024

TG had this issue and I had to manually hard reset their repo.

I can do that now as a quick bodge but we dont want this as a longterm thing for obvious reasons.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment