Git made me resolve 47 commits worth of conflicts. Here's what happened.

Git made me resolve 47 commits worth of conflicts. Here's what happened. Friday afternoon. Pushed some code to GitHub, opened a PR, feeling good about myself. Client wanted to see a demo Monday morning. Monday I open the repo, switch to main, pull latest. 47 commits behind. Cool cool cool. So here's the setup. Multiple devs, feature branches, normal stuff. I was working on auth-redesign for about a week. Made changes, pushed, opened PR. Except the PR had conflicts. I thought "no big deal, fix them after the demo, code works fine for what client needs." This was a mistake. I let the branch drift for three days. Just kept making commits while the team kept merging to main. Didn't touch main once during that time. Monday morning my local main and the actual main were basically different universes. Someone had force-pushed while I was gone. When I tried to merge my feature back in, git saw 47 commits worth of differences. I had two options. Option A was to merge main into my branch, resolv