This repository was archived by the owner on Nov 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 371
Updated README.md for bridges #2629
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Updated README.md
- Loading branch information
commit a7048c5b39fbe57486495590bf8f46b19775afdd
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -18,13 +18,16 @@ it easier to import that change back to upstream repo. | |
|
|
||
| # 2. How to pull latest Bridges code to the `bridges` subtree | ||
| (in practice) | ||
|
|
||
| Actually `bridges` repo has stabilized branch `polkadot-staging` dedicated for releasing. | ||
|
|
||
| ``` | ||
| cd <cumulus-git-repo-dir> | ||
|
|
||
| # this will update new git branches from bridges repo | ||
| # there could be unresolved conflicts, but dont worry, | ||
| # lots of them are caused because of removed unneeded files with patch step, | ||
| ./scripts/bridges_update_subtree.sh fetch | ||
| BRANCH=polkadot-staging ./scripts/bridges_update_subtree.sh fetch | ||
|
|
||
| # so, after fetch and before solving conflicts just run patch, | ||
| # this will remove unneeded files and checks if subtree modules compiles | ||
|
|
@@ -68,8 +71,8 @@ $ git remote add -f my-bridges [email protected]:tomusdrw/parity-bridges-common.git | |
|
|
||
| 2. To update Bridges: | ||
| ``` | ||
| $ git fetch bridges master | ||
| $ git subtree pull --prefix=bridges bridges master --squash | ||
| $ git fetch bridges polkadot-staging | ||
| $ git subtree pull --prefix=bridges bridges polkadot-staging --squash | ||
| ```` | ||
|
|
||
| We use `--squash` to avoid adding individual commits and rather squashing them | ||
|
|
@@ -82,7 +85,7 @@ all into one. | |
|
|
||
| 4. Contributing back to Bridges (creating upstream PR) | ||
| ``` | ||
| $ git subtree push --prefix=bridges my-bridges master | ||
| $ git subtree push --prefix=bridges my-bridges polkadot-staging | ||
| ``` | ||
| This command will push changes to your personal fork of Bridges repo, from where | ||
| you can simply create a PR to the main repo. | ||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.