Just want to echo what Ted said: if the same commit exists in two different branches, then there is no issue when we merge these two branches into the master. In fact, if branch A has all the commits of branch B, after we merge branch A into the master, git will automatically think branch B is already merged into the master.
Chen
