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

  • qwenEnglish
    2·
    1 year ago

    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”.

      • qwenEnglish
        5·
        1 year 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)

      • hallettj@beehaw.orgEnglish
        3·
        1 year ago

        You’ll get conflicts if you pull changes from the original repo any time the deleted files have upstream changes. After you record a merge resolution (presumably by deleting them again) you won’t get conflicts until the next time those files change upstream.

        If you submit a pull request part of its changes will be deleting the files from the original repo.

        OTOH if you delete the files you can always undo that later with git restore --source upstream/main <deleted file paths>. You can restore them in a branch only if you do want to submit a pull request, but leave the files deleted in your own main branch.

        • promitheas@iusearchlinux.fyiOPEnglish
          2·
          1 year ago

          OK I think I get it now. Is there any way to “unlink” my repo from the original repo while still giving credit so I don’t need to create a complete copy and go through all the setup?