Conversation
Not sure how this wasn't a problem before.
|
Should this be getting merged into a different branch? There are a lot of changes here so it's hard to see what the actual proxychains changes were |
lelonek1
suggested changes
Dec 16, 2021
| @@ -0,0 +1,319 @@ | |||
| # Changelog | |||
There was a problem hiding this comment.
Is there a way to bring the master branch here up to date by merging upstream rather than basically squashing all of the changes since the fork was made into a single commit?
There was a problem hiding this comment.
Ah, I see that Mark's Python 3.8 changes were merged to master in this fork, which makes that more complicated. Ideally, we could reset master to point to the same commit as upstream and work from there.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For this, I cleared out the repo, repopulated with 0.7.2 and applied the proxychain changes.