-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
docs: clarify the steps for merging starbase into a project (#353)
Co-authored-by: Dariusz Duda <[email protected]>
- Loading branch information
1 parent
daba40f
commit 3fe73bf
Showing
1 changed file
with
2 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 - | ||
|
@@ -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`` | ||
|