Closed kamiradi closed 3 weeks ago
@sea-bass, My rebase skills are absolutely novice. I don't know what I should be doing.
I started with doing a git rebase main
on the ktopt
branch, resolving all merge conflicts. Now I have a set of unpulled commits that reflect the old branch, and a set of unpushed commits that reflects the rebased branch. Should I create a new pull request on a new branch reflecting the rebased ktopt
?
@sea-bass, My rebase skills are absolutely novice. I don't know what I should be doing.
I started with doing a
git rebase main
on thektopt
branch, resolving all merge conflicts. Now I have a set of unpulled commits that reflect the old branch, and a set of unpushed commits that reflects the rebased branch. Should I create a new pull request on a new branch reflecting the rebasedktopt
?
@kamiradi I think the easiest way to do this wouldn't be to address the merge conflicts but rather drop the commits that are already merged into main. You could either do this by using
git rebase -i origin/main
and remove all commits except
or
Whatever you do, make sure you create a backup of this current version of this branch e.g. by doing git checkout -b kopt_backup
locally on this branch
This PR aims to transcribe a basic Kinematic Trajectory Optimization problem from Moveit to Drake
PlannerManager
classPlanningContext
classktopt_interface
classPS: this is a draft, and the work may be split over a sequence of PRs