Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: clarify the steps for merging starbase into a project #353

Merged
merged 2 commits into from
Feb 13, 2025
+2 −0
Merged

docs: clarify the steps for merging starbase into a project #353

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db17ee
docs: clarify the steps for merging starbase into a project
bepri Feb 13, 2025
6721eca
docs: pr feedback, fetch specifically from main
bepri Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.rst
View file
Open in desktop
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``
bepri marked this conversation as resolved.
Show resolved Hide resolved
- ``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``
bepri marked this conversation as resolved.
Show resolved Hide resolved
- ``git merge --allow-unrelated-histories starbase/main``
- ``git push -f origin main``
- ``git remote remove starbase``
Expand Down
Loading