Cannot merge into the master branch due to the error.
Login/logout, another browser don’t solve the issue.
Hello @alex.sherin,
i’ve had this once where i changed a file in master while I deleted this file in the branch.
(or the other way around - can’t quite remember)
Anyway If this is the case for you try to delete the form on both branches, then merging should work again. (Of course if you need the changes make a separate branch to merge later)
If this is not the case for you - then someone who really understands git will need to help you.
Mark
2 Likes
How did you end up solving your issue?
I cannot seem to understand why I am running into the same thing.
Hi,
Apologies for this – the usual cause for this is some form of conflict that Anvil can’t handle yet. The most straightforward workaround for now is for you to check the app out with Git via the command-line or a visual tool like Sourcetree or Fork, do the merge there, and push the result up to Anvil.
– Signed, The Person Who Has Most Of These Merge Issues On His To-Do List And Will Get To Them, He Promises!
1 Like