8.x is default git branch now. All issue forks created from it. It takes a rebase with conflict resolving.
Set 2.1 as default git branch
Active
2.1
Code