I'm getting -> Error building package error="non-fast-forward update" when the repo has diverged/has a patch applied.

The current fix is to run a lure fix. If I remember correctly, yay allows you to choose if you want to "clean" the git repo on failure so that would be a good feature