If the themes change in the upstream, I think you'll still end up with "both modified" type conflict, "modified by them and deleted by us".
qwen
joined 2 years ago
How is that not the Onion
Goes hard
What even is this device? Is the purpose to always be able to say "oh shit, my friend is calling" to get away from a conversation?
No, that will happen whenever you pull in the changes from them. You basically do a merge of their branch into your branch, which is really similar to making a PR to them (in the former case you integrate their changes into your repo, in the latter it's vice versa). In both cases Git will observe two conflicting sets of changes (one branch modified what another branch removed)