i dont understand why the git experience of making a few small patches to a codebase and then repeatedly merging changes from upstream is so miserable. every time i have to manual merge dozens and dozens of files that i've never touched. i feel like i'm doing it wrong but every time i complain about it and no one has gone "it is because you are doing it wrong"