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

Conversation

@flar
Copy link
Contributor

@flar flar commented May 18, 2022

Resolve merge conflicts for flutter/flutter#103173

@flutter-dashboard
Copy link

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

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

@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-2.13-candidate.0 to main May 18, 2022 19:14
@flar flar requested a review from XilaiZhang May 18, 2022 19:14
@flar flar changed the base branch from main to flutter-2.13-candidate.0 May 18, 2022 19:25
@flar
Copy link
Contributor Author

flar commented May 18, 2022

I specified the release branch when I created this PR, but the UI seems to have forgotten it while creating the PR and running the tests so I just reset it again to flutter-2.13-candidate.0 Hopefully it will stick this time.

@skia-gold
Copy link

Gold has detected about 19 new digest(s) on patchset 1.
View them at https://flutter-engine-gold.skia.org/cl/github/33462

@XilaiZhang
Copy link
Contributor

Thank you! seems like there are some tests failing. Are these tests okay to ignore or maybe we need to fix them? cc @CaseyHillers @itsjustkevin

@XilaiZhang XilaiZhang merged commit d1d08d8 into flutter:flutter-2.13-candidate.0 May 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants