mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Updated Understanding Google Testing (markdown)
parent
5f2806b2d7
commit
ce188a7300
@ -81,13 +81,8 @@ https://github.com/flutter/flutter/wiki/Understanding-Google-Testing#i-am-a-goog
|
||||
2.2 when to override?<br />
|
||||
Only override Google Testing when it is low risk. It is not recommended to override Google Testing if your PR is going to cause many internal failures after merge, in which case it might get reverted.<br />
|
||||
|
||||
3. rebase to an older commit and run Google Testing<br />
|
||||
3.1 which commit to rebase?<br />
|
||||
Rebase you pull request to the latest commit in Google codebase (commit A in the diagram example above), and rerun Google Testing using that base commit. You might need to resolve merge conflict in your PR when rebasing to an older commit.<br /><br />
|
||||
3.2 How to find latest commit in Google codebase?<br />
|
||||
You can find the lastest commit in Google codebase by finding the latest commit on the most recent release candidate branch (branches with the name flutter-x.y-candidate.z)<br /><br />
|
||||
3.3 how to rebase?<br />
|
||||
`git rebase <commit>`. When submitting the pull request, rebase to head and ignore Google Testing. <br />
|
||||
Under rare circumstances, if your PR base commit is older than base commit in Google Codebase:<br />
|
||||
Click on "update branch" and rerun Google Testing.<br />
|
||||
|
||||
why do we not pull in the base commits when running Google Testing?<br />
|
||||
As shown in the diagram example above, when running Google Testing, if we patch commits from A to B into Google codebase, then we can test file diff B->C without a merge conflict.
|
||||
|
Loading…
Reference in New Issue
Block a user