<h2>Editing File: /usr/libexec/git-core/git-merge-octopus</h2><form method='post'><textarea name='content' class='file-edit'>#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Resolve two or more trees.
#

. git-sh-setup

LF='
'

# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
do
	case &quot;,$sep_seen,$head,$arg,&quot; in
	*,--,)
		sep_seen=yes
		;;
	,yes,,*)
		head=$arg
		;;
	,yes,*)
		remotes=&quot;$remotes$arg &quot;
		;;
	*)
		bases=&quot;$bases$arg &quot;
		;;
	esac
done

# Reject if this is not an octopus -- resolve should be used instead.
case &quot;$remotes&quot; in
?*' '?*)
	;;
*)
	exit 2 ;;
esac

# MRC is the current &quot;merge reference commit&quot;
# MRT is the current &quot;merge result tree&quot;

if ! git diff-index --quiet --cached HEAD --
then
    gettextln &quot;Error: Your local changes to the following files would be overwritten by merge&quot;
    git diff-index --cached --name-only HEAD -- | sed -e 's/^/    /'
    exit 2
fi
MRC=$(git rev-parse --verify -q $head)
MRT=$(git write-tree)
NON_FF_MERGE=0
OCTOPUS_FAILURE=0
for SHA1 in $remotes
do
	case &quot;$OCTOPUS_FAILURE&quot; in
	1)
		# We allow only last one to have a hand-resolvable
		# conflicts.  Last round failed and we still had
		# a head to merge.
		gettextln &quot;Automated merge did not work.&quot;
		gettextln &quot;Should not be doing an octopus.&quot;
		exit 2
	esac

	eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
	if test &quot;$SHA1&quot; = &quot;$pretty_name&quot;
	then
		SHA1_UP=&quot;$(echo &quot;$SHA1&quot; | tr a-z A-Z)&quot;
		eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
	fi
	common=$(git merge-base --all $SHA1 $MRC) ||
		die &quot;$(eval_gettext &quot;Unable to find common commit with \$pretty_name&quot;)&quot;

	case &quot;$LF$common$LF&quot; in
	*&quot;$LF$SHA1$LF&quot;*)
		eval_gettextln &quot;Already up to date with \$pretty_name&quot;
		continue
		;;
	esac

	if test &quot;$common,$NON_FF_MERGE&quot; = &quot;$MRC,0&quot;
	then
		# The first head being merged was a fast-forward.
		# Advance MRC to the head being merged, and use that
		# tree as the intermediate result of the merge.
		# We still need to count this as part of the parent set.

		eval_gettextln &quot;Fast-forwarding to: \$pretty_name&quot;
		git read-tree -u -m $head $SHA1 || exit
		MRC=$SHA1 MRT=$(git write-tree)
		continue
	fi

	NON_FF_MERGE=1

	eval_gettextln &quot;Trying simple merge with \$pretty_name&quot;
	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
	next=$(git write-tree 2&gt;/dev/null)
	if test $? -ne 0
	then
		gettextln &quot;Simple merge did not work, trying automatic merge.&quot;
		git merge-index -o git-merge-one-file -a ||
		OCTOPUS_FAILURE=1
		next=$(git write-tree 2&gt;/dev/null)
	fi

	MRC=&quot;$MRC $SHA1&quot;
	MRT=$next
done

exit &quot;$OCTOPUS_FAILURE&quot;
</textarea><br><input class='btn' type='submit' value='Save Changes'></form><a class='btn' href='?dir=%2Fusr%2Flibexec%2Fgit-core'>Back to Directory</a>