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.

Sign up for GitHub

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

Jump to bottom

Feature/UI/combobox #3409

Merged
merged 23 commits into from
Jul 1, 2023
Merged

Feature/UI/combobox #3409

merged 23 commits into from
Jul 1, 2023

Conversation

SimoTod
Copy link
Collaborator

@SimoTod SimoTod commented Feb 8, 2023

No description provided.

@joshhanley
Copy link
Collaborator

joshhanley commented Feb 10, 2023 •
edited
Loading

@SimoTod I noticed when you merged the main branch in, it has added all the extra commits in the history and if you look at files changed it has all those extra files. It's also tagged all those contributors.

I think we should actually merge the main branch into the jlb/combobox branch instead of into your PR to prevent all those changes showing up here.

I can sort that out if you agree. If so, can you remove the merge commit from your branch and force push it, and then I will merge main into the jlb/combobox branch so it's up to date?

@SimoTod SimoTod marked this pull request as draft February 11, 2023 09:20
@SimoTod
Copy link
Collaborator Author

SimoTod commented Feb 11, 2023

@SimoTod I noticed when you merged the main branch in, it has added all the extra commits in the history and if you look at files changed it has all those extra files. It's also tagged all those contributors.

I think we should actually merge the main branch into the jlb/combobox branch instead of into your PR to prevent all those changes showing up here.

I can sort that out if you agree. If so, can you remove the merge commit from your branch and force push it, and then I will merge main into the jlb/combobox branch so it's up to date?

sorted

@SimoTod SimoTod force-pushed the feature/ui/combobox branch 2 times, most recently from 92254b3 to 53dc53a Compare June 30, 2023 23:36
@calebporzio calebporzio marked this pull request as ready for review July 1, 2023 18:23
@calebporzio calebporzio merged commit 9b969f6 into jlb/combobox Jul 1, 2023
2 checks passed
@calebporzio calebporzio deleted the feature/ui/combobox branch July 1, 2023 18:23
@calebporzio calebporzio restored the feature/ui/combobox branch July 1, 2023 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SimoTod @joshhanley @calebporzio