chore: resolving conflicts #690
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Maciej Majek <46171033+maciejmajek@users.noreply.github.com>
maciejmajek
approved these changes
Sep 15, 2025
maciejmajek
added a commit
that referenced
this pull request
Sep 15, 2025
…#620) feat: basic tasks extension (#644) feat: tool calling custom interfaces tasks extension (#636) feat: tool calling spatial reasoning tasks extension (#637) refactor: remove navigation tasks (#638) refactor: o3de config (#630) refactor(`nav2_toolkit`): remove unused `action_client` (#670) fix: manipulaiton bench fixes (#653) docs: rai simbench docs update (#665) feat: planning task and megamind agent (#679) feat: megamind context providers (#687) feat: tool calling bench - manipulation tasks extenstion (#656) chore: resolving conflicts (#690) Co-authored-by: Julia Jia <juliajster@gmail.com> Co-authored-by: Magdalena Kotynia <magdalena.kotynia@robotec.ai> Co-authored-by: Maciej Majek <46171033+maciejmajek@users.noreply.github.com> Co-authored-by: Pawel Kotowski <pawel.kotowski@oleahealth.ai> Co-authored-by: Brian Tuan <btuan@users.noreply.github.com>
maciejmajek
added a commit
that referenced
this pull request
Sep 15, 2025
…#620) feat: basic tasks extension (#644) feat: tool calling custom interfaces tasks extension (#636) feat: tool calling spatial reasoning tasks extension (#637) refactor: remove navigation tasks (#638) refactor: o3de config (#630) refactor(`nav2_toolkit`): remove unused `action_client` (#670) fix: manipulaiton bench fixes (#653) docs: rai simbench docs update (#665) feat: planning task and megamind agent (#679) feat: megamind context providers (#687) feat: tool calling bench - manipulation tasks extenstion (#656) chore: resolving conflicts (#690) Co-authored-by: Julia Jia <juliajster@gmail.com> Co-authored-by: Magdalena Kotynia <magdalena.kotynia@robotec.ai> Co-authored-by: Maciej Majek <46171033+maciejmajek@users.noreply.github.com> Co-authored-by: Pawel Kotowski <pawel.kotowski@oleahealth.ai> Co-authored-by: Brian Tuan <btuan@users.noreply.github.com>
maciejmajek
added a commit
that referenced
this pull request
Sep 15, 2025
feat: tool calling benchmark unified across types and prompts variety… (#620) feat: basic tasks extension (#644) feat: tool calling custom interfaces tasks extension (#636) feat: tool calling spatial reasoning tasks extension (#637) refactor: remove navigation tasks (#638) refactor: o3de config (#630) refactor(nav2_toolkit): remove unused action_client (#670) fix: manipulaiton bench fixes (#653) docs: rai simbench docs update (#665) feat: planning task and megamind agent (#679) feat: megamind context providers (#687) feat: tool calling bench - manipulation tasks extenstion (#656) chore: resolving conflicts (#690) Co-authored-by: Jakub Matejczyk <58983084+jmatejcz@users.noreply.github.com> Co-authored-by: Julia Jia <juliajster@gmail.com> Co-authored-by: Magdalena Kotynia <magdalena.kotynia@robotec.ai> Co-authored-by: Pawel Kotowski <pawel.kotowski@oleahealth.ai> Co-authored-by: Brian Tuan <btuan@users.noreply.github.com> Co-authored-by: jmatejcz <jakub.matejczyk@robotec.ai>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Resolve conflicts between main and development
Proposed Changes
merged main into dev
Issues
Testing