mapdiffbot failing due to merge when there is no merge

spacestation13 / BYONDDiffBots

GitHub applications to render rich diffs of BYOND files

MIT License

6 stars 4 forks source link

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

Open ZeWaka opened 1 month ago

ZeWaka commented 1 month ago

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

AffectedArc07 commented 1 month ago

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.