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

Let my feature branch drift for 3 days. Had to resolve 47 commits worth of conflicts. Here's what I learned about syncing with main regularly.