When 8.1 becomes 8.2 and 8.3, people developing on 8.1 will need to choose whether to continue their work in 8.2 or 8.3. This is intentional. Local branches need to be rebased before push anyway, only the upstream branch config needs to be changed as a result of the split. I don't think a "git branch --set-upstream" every other year or so is that much of a hassle... OTOH it is good to be aware that a split has happened and to think about which line is suitable for your continued work.