Tag: Git merge behavior