if [ -s "$depcheck" ]; then
# We need to switch to the base branch
# ...but only if we aren't there yet (from failed previous merge)
if [ -s "$depcheck" ]; then
# We need to switch to the base branch
# ...but only if we aren't there yet (from failed previous merge)