When we branch from main it ends up making the new branch at the same level as master which prevents merging back in when the time comes to bring it back. Does anyone know what setting to change so that this becomes a sub-branch of master instead?
