From 29f1572ae5341816a628de6175f3bfbfc1384492 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Mon, 22 May 2023 15:08:02 -0500 Subject: [PATCH] docs: use `shorebird/main` branch (#526) --- packages/cutler/FORKING_FLUTTER.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cutler/FORKING_FLUTTER.md b/packages/cutler/FORKING_FLUTTER.md index 4224e9115..a44447c9a 100644 --- a/packages/cutler/FORKING_FLUTTER.md +++ b/packages/cutler/FORKING_FLUTTER.md @@ -10,7 +10,7 @@ We maintain forks of: * flutter/engine * flutter/buildroot -We keep our forked changes on the `main` branch of each repo which we rebase +We keep our forked changes on the `shorebird/main` branch of each repo which we rebase periodically on top of `main` from the upstream repo. When Flutter makes a release, we make a branch in each repo for the Flutter @@ -35,7 +35,7 @@ following branches: * flutter/flutter: `flutter_release/3.7.10` * flutter/engine: `flutter_release/3.7.10` * flutter/buildroot: `flutter_release/3.7.10` -* shorebird: no branch or tag, just a commit to the `main` branch which will +* shorebird: no branch or tag, just a commit to the `shorebird/main` branch which will eventually get pushed to `beta` and `stable` branches for Shorebird. It's rare that we will ever need to add commits to one of these branches, @@ -216,4 +216,4 @@ cd $HOME/Documents/GitHub/_shorebird/shorebird git tag -a -m "shorebird-3.10.0-1.5.pre" shorebird-3.10.0-1.5.pre $VERSION git push origin shorebird-3.10.0-1.5.pre git push origin/beta shorebird-3.10.0-1.5.pre -``` \ No newline at end of file +```