Just "accept theirs".
As I'm touching the places where the versions are defined there is of course a conflict, but when you look at it, you see that it is obvious and easy to resolve as I said.
Please include it, it reduces the amount of places where versions need to be incremented and reduces risk of manual error that happend already which made me do this change finally.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
i'm getting conflicts here. Is it really necessary to merge into 4.5?
Just "accept theirs".
As I'm touching the places where the versions are defined there is of course a conflict, but when you look at it, you see that it is obvious and easy to resolve as I said.
Please include it, it reduces the amount of places where versions need to be incremented and reduces risk of manual error that happend already which made me do this change finally.
sorry about that, I didn't look closely enough.
Committed#21310 to 4.5.x