From 36c7ea7e913ed02e45b9516b8251100394ce8c47 Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Thu, 18 Jul 2024 23:55:59 -0600 Subject: [PATCH 1/2] Document branch strategy Signed-off-by: Ryan Friedman --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 0bde2b5ac..a8744f4e3 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,19 @@ If you use this work in an academic context, please cite the following publicati url = {http://www.springer.com/de/book/9783319260525} } +## Branches + +These branches are currently maintained: +* ROS 1 + * [master](https://github.com/ANYbotics/grid_map) +* ROS 2 + * [humble](https://github.com/ANYbotics/grid_map/tree/humble) + * [iron](https://github.com/ANYbotics/grid_map/tree/iron) + * [rolling](https://github.com/ANYbotics/grid_map/tree/rolling) + +Pull requests for ROS 1 should target `master`. +Pull requests for ROS 2 should target `rolling` and will be backported if they do not break ABI. + ## Documentation An introduction to the grid map library including a tutorial is given in [this book chapter](http://www.researchgate.net/publication/284415855). From 57ac5017dbc8da9301db3b3a094a59e33d3bff53 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 Jul 2024 11:03:22 -0600 Subject: [PATCH 2/2] Add Jazzy Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a8744f4e3..cd4a5638f 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ These branches are currently maintained: * ROS 2 * [humble](https://github.com/ANYbotics/grid_map/tree/humble) * [iron](https://github.com/ANYbotics/grid_map/tree/iron) + * [jazzy](https://github.com/ANYbotics/grid_map/tree/jazzy) * [rolling](https://github.com/ANYbotics/grid_map/tree/rolling) Pull requests for ROS 1 should target `master`.