this post was submitted on 23 Jun 2023
6 points (100.0% liked)
Programming
13368 readers
1 users here now
All things programming and coding related. Subcommunity of Technology.
This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
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".
Wouldnt that only happen if I try to make a pull request back to the original repo?
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)