You can do it as long as your changes are only to files that are otherwise ident...

recursivecaveat on Oct 8, 2023 | parent | context | favorite | on: Things I just don't like about Git

You can do it as long as your changes are only to files that are otherwise identical on both ends of the checkout (meaning there's 0 possibility of conflict).