I'm guilty of creating a fork that just goes off the rails, but still needs to keep up with upstream. I do it via a skill and seems to work good enough for now: https://github.com/midasvo/findroid-ce/tree/main/.claude/ski...
Since it's just a duplicate folder, I can always fall back if it fubars.