You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Track total number of merge conflicts when cherry picking PR from master branch to release branch #141819
Context: in the current github actions to auto apply cherry pick, we are not applying any resolution strategy when merge conflict happens. no resolution strategy was applied per previous discussions that we do not want to auto resolve and suggest wrong code to users.
We want to track the number of prs that would hit merge conflict when cherry picked from master to release. There are two ways to evaluate this metrics:
randomly pick PRs from master branch and cp them to release branch
when shipping releases, count the number of merge conflict PRs referenced in the cherry pick request
If using method 1 to collect this metric:
below are a list of PRs randomly selected from master branch that would hit merge conflict when cherry picked:
Will keep updating the list when more data points become available (where the pr has a base commit newer than our merged commit)
Summary:
The merge conflicts as manifested in workflow runs align with the merge conflicts the pr would encounter if cherry picked through the terminal. and .ci.yaml changes seems to be the pr change that hit more conflicts than others.
This thread has been automatically locked since there has not been any recent activity after it was closed. If you are still experiencing a similar issue, please open a new bug, including the output of flutter doctor -v and a minimal reproduction of the issue.
Activity
matanlurey commentedon May 16, 2025
Closing as stale. Please feel free to open a new issue with a strong justification for doing this.
(To be clear, the
-releaseand-infrateams have no plans to work on this in the known future)github-actions commentedon May 30, 2025
This thread has been automatically locked since there has not been any recent activity after it was closed. If you are still experiencing a similar issue, please open a new bug, including the output of
flutter doctor -vand a minimal reproduction of the issue.