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

fix for 2.2 #37

Closed
wants to merge 3 commits into from
Closed

fix for 2.2 #37

wants to merge 3 commits into from

Conversation

flightlex
Copy link
Contributor

No description provided.

@Folleach
Copy link
Owner

Thank you for PR!
I'll watch it soon.

So far, I can say that two merge commits in your repository were unnecessary. They refer to the PR numbers that are made in your repository and do not make sense.
You could make separate branches for your functionality, then do PR with them in the origin repository.
Once the PR is in the main branch, you can simply pull your main branch from the origin repository.

Now, since your commit is not signed, I can make a cherry pick during the merge. Can I?

@flightlex
Copy link
Contributor Author

Thank you for PR! I'll watch it soon.

So far, I can say that two merge commits in your repository were unnecessary. They refer to the PR numbers that are made in your repository and do not make sense. You could make separate branches for your functionality, then do PR with them in the origin repository. Once the PR is in the main branch, you can simply pull your main branch from the origin repository.

Now, since your commit is not signed, I can make a cherry pick during the merge. Can I?

go ahead

@Folleach
Copy link
Owner

Folleach commented May 8, 2024

I've cherry pick this commit to 1f4e91e
Then I made some fixes, described them in the commit 24582c6

Released in v0.2.28

GitHub doesn't match changes from origin to the pull request, so I'm closing this PR

@Folleach Folleach closed this May 8, 2024
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