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

Apply new input validation method for Create Plugin dialog #76772

Closed

Conversation

eugene87222
Copy link
Contributor

@eugene87222 eugene87222 commented May 6, 2023

@brno32
Copy link
Contributor

brno32 commented May 6, 2023

If I'm not mistaken, instead of having a merge commit in your source branch you'll wanna rebase off of the upsteam master and squash all your commits into one.

@eugene87222
Copy link
Contributor Author

@brno32 would you like to teach me how to merge them😢
My git tree becomes little messy right now

@brno32
Copy link
Contributor

brno32 commented May 6, 2023

https://docs.godotengine.org/en/stable/contributing/workflow/pr_workflow.html#the-interactive-rebase

A bit simpler might be to first rebase

$ git pull --rebase upstream master

then squash your commits with git rebase -i HEAD~2

You'll need to force push after rewriting your history.

@eugene87222 eugene87222 force-pushed the fix-create-plugin-dialog branch from 9c55ff3 to 5fbf7ca Compare May 6, 2023 09:02
@eugene87222 eugene87222 requested review from a team as code owners May 6, 2023 09:02
@eugene87222 eugene87222 closed this May 6, 2023
@eugene87222 eugene87222 deleted the fix-create-plugin-dialog branch May 6, 2023 09:03
@eugene87222
Copy link
Contributor Author

Hmm I think it would be more convenient for me to create a new PR given my current situation.
I just forgot to pull the latest code before starting to fix the issue😿. I'll remember to do it next time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants