fix(branch onto): rebase loop on conflicts

fix(branch onto): rebase loop on conflicts #88