mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Updated Understanding Google Testing (markdown)
parent
ce188a7300
commit
e13cd0827b
@ -65,7 +65,7 @@ One of the most common cause of such an error is a merge conflict. A merge confl
|
||||
For example, as shown in the picture: suppose your pull request has a base commit of B and a head commit of C, then the content of your
|
||||
pull request would be `diff: B -> C`. Now, suppose the latest flutter commit in Google codebase is at commit A. When Google Testing tests the content of your pull request against the internal codebase, we patch the file diff `B->C` to the base commit A. And therefore a merge conflict happens. Since merge conflicts could not be resolved without human intervention, Google Testing would quickly exhaust the max number of retries.
|
||||
|
||||
### **To resolve a merge conflict, there are three ways**:
|
||||
### **To resolve a merge conflict **:
|
||||
|
||||
#### 1. wait for commits in Google codebase to catch up, and then rerun Google Testing.<br />
|
||||
1.1. When to rerun?<br />
|
||||
@ -79,7 +79,7 @@ As time goes on, more flutter commits roll into Google codebase through flutter
|
||||
2.1 how to override?<br />
|
||||
https://github.com/flutter/flutter/wiki/Understanding-Google-Testing#i-am-a-googler-i-dont-want-google-testing-to-run-and-how-do-i-manually-set-google-testing-to-pass. <br /><br />
|
||||
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 />
|
||||
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 /><br /><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 />
|
||||
|
Loading…
Reference in New Issue
Block a user