Hey everyone, so I wrote this post a short time ago, and now I have another question regarding the same repository. I would like to remove the themes that I haven’t touched as I don’t want to have to deal with maintaining them every time there is a Lemmy update. Is that something I am allowed to do? Is it considered a crappy thing to do to the other dev?

Thanks in advance for all your help!

Edit: Of course I am clearly giving credit to the original dev both on here on lemmy, as well as within my code

  • qwen@lemmy.blahaj.zoneEnglish
    4·
    2 years ago

    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)