Julius Werner jwerner@chromium.org wrote:
It's very easy to clean up programmatically though, just run this again:
find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'
Indeed. The biggest challenge for me was to learn how to correctly resolve these merge conflicts on gerrit, but I finally succeeded with the help of this article - https://www.entropywins.wtf/blog/2013/07/01/resolving-a-merge-conflict-on-ge...