This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Conversation
git-subtree-dir: bridges git-subtree-split: 89a76998f93c8219e9b1f785dcce73d4891e7068
This confuses Cargo when building from the Polkadot repo
HCastano
added
B0-silent
ordian
reviewed
Apr 21, 2021
tomusdrw
approved these changes
Apr 21, 2021
|
how are we supposed to merge it? |
Contributor
Author
So a squash-merge won't work for the above stated reasons, a rebase-merge won't work due to conflicts, and a regular merge is disabled. So we either need someone with admin access to (temporarily) disable regular merges, or merge manually and push to |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This PR is a follow up to #2515 where the
parity-bridges-commonrepo was added a a GitSubtree.
Unknown to us at the time, squash merging that PR ended up putting us in a situation
where we were unable up update the bridges subtree via
git subtree pull. This isbecause we were already working with a squashed version of the bridge history (since we
added the repo through
git subtree add ... --squash).Note that this time we should not squash merge this PR so that in the future we can
easily update the bridges subtree using
git subtree pull