Skip to content
This repository has been archived by the owner on Jan 21, 2025. It is now read-only.

New repo structure #27

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

New repo structure #27

wants to merge 10 commits into from

Conversation

kkholst
Copy link
Owner

@kkholst kkholst commented Jan 20, 2025

No description provided.

@kkholst kkholst requested a review from benesom January 20, 2025 13:55
Copy link

codecov bot commented Jan 20, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.06%. Comparing base (dd10e72) to head (072b939).

Additional details and impacted files
@@             Coverage Diff              @@
##           develop      #27       +/-   ##
============================================
+ Coverage         0   47.06%   +47.06%     
============================================
  Files            0       50       +50     
  Lines            0     3971     +3971     
============================================
+ Hits             0     1869     +1869     
- Misses           0     2102     +2102     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kkholst
Copy link
Owner Author

kkholst commented Jan 20, 2025

@benesom, the new repo structure should now be ready. Perhaps we can together look into how we best can replace the main branch of kkholst/targeted with this branch including all history?

@benesom
Copy link
Collaborator

benesom commented Jan 21, 2025

@benesom, the new repo structure should now be ready. Perhaps we can together look into how we best can replace the main branch of kkholst/targeted with this branch including all history?

It should be as easy as deleting the main branch on kkholst/targeted, followed by

git push https://github.com/kkholst/targeted new-repo-structure:main

This will push this branch as the main branch on kkholst/targeted.

EDIT: this actually won't work. Someone with a local copy of main will receive a message about merging unrelated histories. This can only be fixed by deleting the local copy of main and then pulling the new, i.e. this branch, from the targeted remote.

Here I'm trying to fork kkholst/targetd and create a PR. The problem is the same, which makes sense.
image

EDITT: it's possible to merge branches with unrelated histories. But I would expect the commit history to look very funky. I can try it out on a feature branch if you'll add me as an admin to kkholst/targeted.

@kkholst kkholst marked this pull request as draft January 21, 2025 08:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants