Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Conversation

@godofredoc
Copy link
Contributor

Reverts #4650

This is to make main the default branch.
@flutter-dashboard
Copy link

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to master. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@flutter-dashboard flutter-dashboard bot changed the base branch from master to main January 7, 2022 19:29
@godofredoc godofredoc changed the base branch from main to master January 7, 2022 19:29
@stuartmorgan-g
Copy link
Contributor

I looked at the implementation of the mirror script a bit, and it has:

            result = await octokit.git.updateRef({
                ...github.context.repo,
                ref: `heads/${destBranchName}`,
                sha: sourceBranchSha,
                force: true,
            });

I haven't looked at the internals of that, but the force: true makes me think we don't want to do this. I'm concerned that this will destroy main.

@stuartmorgan-g
Copy link
Contributor

If it is indeed doing a force-push to the target branch, then all we need to do is land #4654 and it'll stomp master.

@stuartmorgan-g
Copy link
Contributor

If it is indeed doing a force-push to the target branch, then all we need to do is land #4654 and it'll stomp master.

This was the case, so this PR isn't needed.

@stuartmorgan-g stuartmorgan-g removed their request for review January 7, 2022 20:25
@godofredoc godofredoc deleted the revert-4650-swap_mirroring_order branch June 3, 2022 22:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants