Ask HN: How do you handle conflicts with your peers?

The question is a generic version of the problem I am facing in my team.

A senior person keeps leaving comments to my diffs which are at best can be summarized as his preference for doing things.

More than not, I end up making those changes, because as they don't bring any benefits or harm over one another; trying to convince the other person is a more effortful job and also alters the relationship with that person for bad.

I am looking for ways how you handle similar situations and how I can make best out of it.