@sophia mostly sounds like what i'd do, maybe with a rebase in there if i change main. but I haven't done version control on a twine project before so