Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: a790c5b71c6fbfe3350f8ffc99c54b08eb7fe4b3
https://github.com/WebKit/WebKit/commit/a790c5b71c6fbfe3350f8ffc99c54b08eb7fe4b3
Author: Alex Atwater <[email protected]>
Date: 2024-11-05 (Tue, 05 Nov 2024)
Changed paths:
M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py
Log Message:
-----------
Provide more instructions when running git-webkit conflict
https://bugs.webkit.org/show_bug.cgi?id=282280
rdar://132414248
Reviewed by Ryan Haddad.
User will now be better informed of what they need to do to resolve the
conflict.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/conflict.py:
(Conflict):
(Conflict.main):
Canonical link: https://commits.webkit.org/286165@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
