Skip to content

[PROBABLY DON'T MERGE] dev/alma_multi_robot#22

Open
willat343 wants to merge 5 commits intomainfrom
dev/alma_multi_robot
Open

[PROBABLY DON'T MERGE] dev/alma_multi_robot#22
willat343 wants to merge 5 commits intomainfrom
dev/alma_multi_robot

Conversation

@willat343
Copy link
Collaborator

This branch is kinda weird, i could easily see this as one to not merge back, especially since it contains #5 (dev/better_initialization) plus some additional changes.

Like the other branches, options include:

  1. Merge main into this PR and address merge conflicts. Then merge this PR into main.
  2. Close this PR without merging, and delete the branch with git push origin --delete <branch_name>.
  3. Create a new branch (or rebase if brave) off of main and cherry-pick valuable changes for a new PR. Then delete this branch and close the PR.
image

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