search

tianocore / edk2-edkrepo

Repository for the edkrepo utility
Other
21 stars 24 forks source link

Fix f2f-cherry-pick failure when merge conflicts occur #210

Closed nate-desimone closed 7 months ago

nate-desimone commented 7 months ago

In git version 2.39 and newer, the text indicating a cherry-pick merge conflict changed from:

"after resolving the conflicts"

to:

"After resolving the conflicts"

Changed the string comparison to be case insensitive.