search

ros-industrial / abb

ROS-Industrial ABB support (http://wiki.ros.org/abb)
147 stars 156 forks source link

Sync kinetic-devel with release branch and update changelogs #171

Closed gavanderhoorn closed 5 years ago

gavanderhoorn commented 5 years ago

As per subject.

I would propose to change the release workflow from this release onwards: update changelogs in the development branch, then merge -devel into the release branch and release from the release branch.

That would avoid PRs from-and-to the release and -devel branches and keeps the history relatively sane with fewer merge conflicts (such as e122ba0).

gavanderhoorn commented 5 years ago

This is in preparation for a new Kinetic release.

Once this is out, we can release Melodic from the kinetic-devel as well, provided it builds there (which I believe it does).

gavanderhoorn commented 5 years ago

Thanks @Levi-Armstrong.