I added the patch and no longer received the error, but I still got a message that the merge was denied because it would change the mainline history.
I added the patch and no longer received the error, but I still got a message that the merge was denied because it would change the mainline history.