I disagree. Changing a word which could potentially offend someone even though it is not rooted in something offensive is exhausting and silly. People can find anything to be offended by. If someone is ignorant about the terminology, such as the 'master branch', then I would explain to them the history of the word. That is much easier than forcing everyone to change industry standard terminology with the bonus of conveying some knowledge.