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

Sync melodic-devel to moveit2/master #26

Merged
merged 2 commits into from
Feb 23, 2019
Merged

Sync melodic-devel to moveit2/master #26

merged 2 commits into from
Feb 23, 2019

Conversation

davetcoleman
Copy link
Member

@davetcoleman davetcoleman commented Feb 23, 2019

We're only 2 commits behind, but i wanted to test the waters now. How I did this:

git clone git@github.com:ros-planning/moveit
git remote add davetcoleman2 git@github.com:davetcoleman/moveit2
git push davetcoleman2 melodic-devel

This allows my fork of moveit2 to have the latest melodic-devel branch. Then using Github's interface I created a PR from melodic-devel to master

EDIT [rhaschke]:
The proposed approach seems to generate extra merge commits as seen in #35.
A better sync approach is described in #36.

@rhaschke rhaschke merged commit 92b170c into moveit:master Feb 23, 2019
@rhaschke
Copy link
Contributor

It will be important to merge commit such syncs, otherwise commit history is screwed up.

@henningkayser henningkayser mentioned this pull request Mar 7, 2019
@rhaschke rhaschke mentioned this pull request Mar 8, 2019
JafarAbdi pushed a commit to JafarAbdi/moveit2 that referenced this pull request Oct 28, 2019
MikeWrock pushed a commit to MikeWrock/moveit2 that referenced this pull request Aug 15, 2022
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