> I wouldn't consider it my responsibility to apply the fix to anyone else's branch I guess my situation is a bit unusual. We have two production branches bec

> I wouldn't consider it my responsibility to apply the fix to anyone else's branch I guess my situation is a bit unusual. We have two production branches because we're running our code in two different environments. So we have two branches that are effectively origin/masters. > git merge absolutely does treat a byte-for-byte identical change as not a conflict That's news to me. I guess I'll have to try that again because I have a very clear memory of seeing this happen and thinking WTF? But that could have been a long time ago.