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.

Sign up for GitHub

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

Jump to bottom

Merge sdf4 -> sdf6 #257

Closed
wants to merge 1 commit into from
Closed

Merge sdf4 -> sdf6 #257

wants to merge 1 commit into from

Conversation

scpeters
Copy link
Member

Includes changes from #248.

I'm trying out the workflow of merging changes forward.

@scpeters scpeters requested a review from chapulina April 28, 2020 23:33
@scpeters
Merge sdf4 -> sdf6
92422b9 
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
chapulina
chapulina approved these changes Apr 28, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying out the workflow of merging changes forward.

How did you do it? I see there's only a single commit authored by you. When we start porting lots of changes, it would be nice to preserve some of the history.

@scpeters
Copy link
Member Author

How did you do it? I see there's only a single commit authored by you. When we start porting lots of changes, it would be nice to preserve some of the history.

yeah, that's a good point. I did the following:

git checkout sdf4
git checkout sdf6
git merge sdf4
# then used the following to resolve conflicts
git mergetool

I'll make a parallel PR using cherry-pick to see if that's any better

@scpeters scpeters mentioned this pull request Apr 29, 2020
Merged
@scpeters
Copy link
Member Author

see #258 for an alternative approach

@scpeters
Copy link
Member Author

merged #258 instead

@scpeters scpeters closed this Apr 29, 2020
@scpeters scpeters deleted the merge_4_to_6 branch April 29, 2020 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@scpeters @chapulina