This is probably the best answer if you have urgency to get this fixed.
Maybe the best thing you could do is to create a clone (in anvil) of your app first, then do git clone on your PC to merge and push the changes. The bug is probably only in the IDE for commiting/merging and if you do it manually you won’t have issues (I’m guessing).
Then you can go on with your life AND have a clone with the issue so that the Anvil Staff can take a look into it later.