[N0ctrnl]

That's where forking a repo and putting changes in there is useful. You can commit the upstream changes down to yours and manage conflicts and not have to manually re-edit things every time.