this post was submitted on 23 Jun 2023
6 points (100.0% liked)
Programming
13362 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)
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