I've spent a couple of weeks working in a separate branch. Before the merge, the feature branch had no custom functions errors; main had no custom functions errors. The merge process had no conflicts. And yet, when I merge into main I get errors on my custom functions and things no longer compile. So now I'm stuck and I can't release my new features to my users.
Note: I'm using the legacy version of merge because Git merge says "No changes to merge" (maybe because I created my branch a couple of weeks ago before Git was available, not sure).