RESOLVED FIXED282280
[git webkit conflict] Command should put you in a conflict state 
https://bugs.webkit.org/show_bug.cgi?id=282280
Summary [git webkit conflict] Command should put you in a conflict state
alexandera_22
Reported 2024-10-29 13:54:51 PDT
when running git-webkit conflict, user should be put into a conflict state
Attachments
Add attachment proposed patch, testcase, etc.
alexandera_22
Comment 1 2024-10-30 14:02:27 PDT
<rdar://problem/132414248>
alexandera_22
Comment 2 2024-10-30 14:18:17 PDT
Pull request: https://github.com/WebKit/WebKit/pull/35957
EWS
Comment 3 2024-11-05 10:21:53 PST
Committed 286165@main (a790c5b71c6f): <https://commits.webkit.org/286165@main> Reviewed commits have been landed. Closing PR #35957 and removing active labels.
Note You need to log in before you can comment on or make changes to this bug.