From c4372c62a73022c5ecc01a36a0514b1a561514e1 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Sat, 1 Jun 2019 22:32:13 -0700 Subject: [PATCH] DRAFT README.md: Branch is now rebaseable [morty-draft] --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e02436c..23d47e3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +# Rebaseable Branch `morty-draft` + +**NOTICE:** This branch may be rebased without warning. You are advised to +specify the `--rebase` option when pulling. + # UNDER CONSTRUCTION! The original implementation of `meta-ros` for ROS 1 Indigo Igloo @@ -8,7 +13,6 @@ Bouncy Bolson) from recipes generated by [superflore](https://github.com/ros-infrastructure/superflore/) and might not be usable for a little while. Please see this [wiki page](https://github.com/ros/meta-ros/wiki/Superflore-OE-Recipe-Generation-Scheme) -for details of what is being done. Draft versions of these changes are in the -[`thud-draft`](https://github.com/ros/meta-ros/tree/thud-draft) branch. +for details of what is being done. Draft versions of these changes are in this branch. The original implementation has been retained in the [`legacy`](https://github.com/ros/meta-ros/tree/legacy) branch.