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
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.
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?
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)
So, if you remove those files you’re considering removing, will you have completely ship-of-thesiused everything in 2xx04’s repo from your repo?
Either way, just my $0.02, maybe it makes sense to just start a whole new repo. If you do need something from 2xx04’s repo (like his fork of Bootstrap, maybe?), I’d say copy it into your repo and make sure the README.md links to 2xx04’s repo and describes specifically what you copied and what’s 2xx04’s.
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programming@beehaw.org
All things programming and coding related. Subcommunity of Technology.
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?
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.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?
The concern they raised only matters if you plan to pull updates from the repo you’re forking.
No i don’t plan on it. Does that mean im covered
Yes, if you don’t plan to pull updates then you’re covered
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)
A fork is effectively your own repo, so you can do with that as you please. Afaik MIT license doesn’t hinder you from removing anything.
That makes sense, just wanted to make sure there wasnt some weird condition
Yeah, MIT license is absurdly free and flexible, so basically you just need to retain copyright notice and license copy.
So, if you remove those files you’re considering removing, will you have completely ship-of-thesiused everything in 2xx04’s repo from your repo?
Either way, just my $0.02, maybe it makes sense to just start a whole new repo. If you do need something from 2xx04’s repo (like his fork of Bootstrap, maybe?), I’d say copy it into your repo and make sure the README.md links to 2xx04’s repo and describes specifically what you copied and what’s 2xx04’s.
Making another repo is not something i feel like doing rn. Id prefer to leave the older themes in there and just not maintain them