search

b-it-bots / mas_perception

2 stars 13 forks source link

merge devel into kinetic #32

Closed minhnh closed 5 years ago

minhnh commented 5 years ago

resolves #29

argenos commented 5 years ago

29 was also about bringing the changes from kinetic onto devel, since that was the original problem. Is devel also up to date now?

minhnh commented 5 years ago

@argenos it was easier to merge into kinetic because there are deleted files in devel. Maybe I should have requested merge into devel instead? Additionally, I have discussed with @mhwasil, and we agreed that the changes are stable enough to be in kinetic.

Edit: currently the devel and kinetic branches on my fork are even with each other, so merging minhnh:devel into b-it-bots:devel is also possible. I'd like to keep the comments so far on the PR though, if possible.

argenos commented 5 years ago

@minhnh then that probably solves the issues, once this is merged, just open a PR from kinetic to devel. Moving forward, we should always do it in the right order, at least until we agree on something in https://github.com/b-it-bots/unmerged_packages_for_testing/issues/52

minhnh commented 5 years ago

How about PR minhnh:kinetic into b-it-bots:devel, i.e. changing the target branch of this PR into devel? Then I can open another PR from b-it-bots:devel into b-it-bots:kinetic.

argenos commented 5 years ago

That sounds good!