Bug 282280
| Summary: | [git webkit conflict] Command should put you in a conflict state | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | alexandera_22 |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED FIXED | ||
| Severity: | Normal | CC: | webkit-bug-importer |
| Priority: | P2 | Keywords: | InRadar |
| Version: | WebKit Nightly Build | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
alexandera_22
when running git-webkit conflict, user should be put into a conflict state
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
alexandera_22
<rdar://problem/132414248>
alexandera_22
Pull request: https://github.com/WebKit/WebKit/pull/35957
EWS
Committed 286165@main (a790c5b71c6f): <https://commits.webkit.org/286165@main>
Reviewed commits have been landed. Closing PR #35957 and removing active labels.