# The merge got stuck! Let the user fix it up.
info "You are in a subshell. If you abort the merge,"
info "use \`exit 1\` to abort the recursive update altogether."
if ! sh -i </dev/tty; then
# The merge got stuck! Let the user fix it up.
info "You are in a subshell. If you abort the merge,"
info "use \`exit 1\` to abort the recursive update altogether."
if ! sh -i </dev/tty; then
info "Updating base with $dep changes..."
if ! git merge "$dep"; then
if [ -z "$TG_RECURSIVE" ]; then
info "Updating base with $dep changes..."
if ! git merge "$dep"; then
if [ -z "$TG_RECURSIVE" ]; then
merge_with="refs/top-bases/$name"
## Second, update our head with the remote branch
merge_with="refs/top-bases/$name"
## Second, update our head with the remote branch
if branch_contains "$name" "$rname"; then
info "The $name head is up-to-date wrt. its remote branch."
else
if branch_contains "$name" "$rname"; then
info "The $name head is up-to-date wrt. its remote branch."
else
if [ -z "$TG_RECURSIVE" ]; then
info "Please commit merge resolution. No need to do anything else"
info "You can abort this operation using \`git reset --hard\` now"
if [ -z "$TG_RECURSIVE" ]; then
info "Please commit merge resolution. No need to do anything else"
info "You can abort this operation using \`git reset --hard\` now"
else # subshell
info "Please commit merge resolution and call exit."
info "You can abort this operation using \`git reset --hard\`."
fi
exit 3
fi
else # subshell
info "Please commit merge resolution and call exit."
info "You can abort this operation using \`git reset --hard\`."
fi
exit 3
fi