Sync melodic-devel to moveit2/master#26
Merged
rhaschke merged 2 commits intomoveit:masterfrom Feb 23, 2019
davetcoleman:melodic-devel
Merged
Sync melodic-devel to moveit2/master#26rhaschke merged 2 commits intomoveit:masterfrom davetcoleman:melodic-devel
rhaschke merged 2 commits intomoveit:masterfrom
davetcoleman:melodic-devel
Conversation
This reverts commit dbde093.
rhaschke
approved these changes
Feb 23, 2019
Contributor
|
It will be important to merge commit such syncs, otherwise commit history is screwed up. |
Closed
Merged
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
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We're only 2 commits behind, but i wanted to test the waters now. How I did this:
This allows my fork of moveit2 to have the latest
melodic-develbranch. Then using Github's interface I created a PR frommelodic-develtomasterEDIT [rhaschke]:
The proposed approach seems to generate extra merge commits as seen in #35.
A better sync approach is described in #36.