You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
Looks fine to me. The log messages mentions some conflicting files, maybe it makes sense to merge it manually and adapting the log messages.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.