Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/replace test pause with dhtsync #134

Closed

Conversation

mattyg
Copy link
Member

@mattyg mattyg commented Oct 6, 2023

Repeat of #105 where I borked the git history @robbiecarlton

@ThetaSinner ThetaSinner self-requested a review November 1, 2023 17:27
@ThetaSinner ThetaSinner changed the base branch from develop to main November 2, 2023 15:22
@ThetaSinner ThetaSinner changed the base branch from main to develop November 2, 2023 15:23
@ThetaSinner
Copy link
Member

Please can this target main instead of develop? This repo needs a contribution guide but I'm not sure the branches are being used consistently even by maintainers yet. I had a conversation about this a while ago and I'll check on that and get it into a short contribution guide.

@ThetaSinner
Copy link
Member

I tried changing the base but it makes a mess to just do that because develop is out of sync with main

@ThetaSinner
Copy link
Member

I'm just discovering that develop and main appear to be out of sync. I assume one was the upstream of the other. I'm going to get them tidied up so hopefully this becomes a simple base change

@ThetaSinner
Copy link
Member

I've replaced this PR with these same commits and synced with the updated base branch. Normally wouldn't do that but I'm trying to get develop synced up so I can proceed with tweaking the branching strategy on the repo :)

@ThetaSinner ThetaSinner closed this Nov 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants