Skip to content

Commit

Permalink
docs: clarify the steps for merging starbase into a project (#353)
Browse files Browse the repository at this point in the history
Co-authored-by: Dariusz Duda <[email protected]>
  • Loading branch information
bepri and dariuszd21 authored Feb 13, 2025
1 parent daba40f commit 3fe73bf
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Migrate existing projects
#. Finally, once all files are manually synced, actually sync the git history:

- ``git remote add starbase [email protected]:canonical/starbase.git``
- ``git fetch starbase main``
- ``git merge --allow-unrelated-histories starbase/main``
- ``git remote remove starbase``
- Don't forget to review all the new files and dirs that this merge adds -
Expand All @@ -113,6 +114,7 @@ Create a new project

- ``git clone <your-repo>``
- ``git remote add starbase [email protected]:canonical/starbase.git``
- ``git fetch starbase main``
- ``git merge --allow-unrelated-histories starbase/main``
- ``git push -f origin main``
- ``git remote remove starbase``
Expand Down

0 comments on commit 3fe73bf

Please sign in to comment.