Summary: | 'git webkit pr' failed (when adding new files?) | ||
---|---|---|---|
Product: | WebKit | Reporter: | Simon Fraser (smfr) <simon.fraser> |
Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
Status: | RESOLVED WONTFIX | ||
Severity: | Normal | CC: | jbedard, simon.fraser, webkit-bug-importer |
Priority: | P2 | Keywords: | InRadar |
Version: | Safari Technology Preview | ||
Hardware: | Unspecified | ||
OS: | Unspecified | ||
Bug Depends on: | |||
Bug Blocks: | 239082 |
Description
Simon Fraser (smfr)
2022-06-16 22:16:34 PDT
This is definitely a "won't fix". I believe the key here is going to be this bit: ` Successfully rebased and updated refs/heads/eng/Update-Intersection-Observer-WPTs. ` That means we're not just creating a PR, we also rebasing your PR branch before making our change. The error message here is coming from `git`, not `git-webkit`, and indicates the rebase failed. In that case, there isn't really anything the script can safely do. The user must resolve the conflict. |