@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
@sophia generally on anything where i'm scared of merge conflicts i do a rebase to avoid them so i think it should work for a twine file too
@sophia generally on anything where i'm scared of merge conflicts i do a rebase to avoid them so i think it should work for a twine file too