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

revert: remove commits for robot model collision features from develop #184

Merged
merged 12 commits into from
Apr 17, 2024

Conversation

domire8
Copy link
Member

@domire8 domire8 commented Apr 17, 2024

Description

Not sure if this will turn out well, but I reverted all commits except the ones that existed before IO states and IO states from develop. I didn't have any conflicts apart from versions and changelog during the reverts.

Review guidelines

Estimated Time of Review: 5 minutes

Checklist before merging:

  • Confirm that the relevant changelog(s) are up-to-date in case of any user-facing changes

@domire8 domire8 requested a review from eeberhard April 17, 2024 08:42
@domire8
Copy link
Member Author

domire8 commented Apr 17, 2024

This diff seems to indicate that this is what we want though

Copy link
Member

@eeberhard eeberhard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The selection of commits seems good to me. I guess the specific patch version tag 7.3.6 doesn't matter so much since we will move away from these incremental version.

Now whether to FF or squash this reversal 🤔 after release 7.4 we will immediately undo them, and the individual commit contributions are still preserved in the history. So it might be safer and simpler to squash this PR

Edit: then again, it's maybe worth the slightly extra work to keep all commits separate, more fine-grained history in case we do need to patch one or the other commit.

@domire8 domire8 merged commit 999bad7 into develop Apr 17, 2024
7 checks passed
@domire8 domire8 deleted the revert/robot-model branch April 17, 2024 10:12
@github-actions github-actions bot locked and limited conversation to collaborators Apr 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants