File Manager

✏️ /

#!/usr/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 ",$sep_seen,$head,$arg," in
	*,--,)
		sep_seen=yes
		;;
	,yes,,*)
		head=$arg
		;;
	,yes,*)
		remotes="$remotes$arg "
		;;
	*)
		bases="$bases$arg "
		;;
	esac
done

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

# MRC is the current "merge reference commit"
# MRT is the current "merge result tree"

if ! git diff-index --quiet --cached HEAD --
then
    gettextln "Error: Your local changes to the following files would be overwritten by merge"
    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 "$OCTOPUS_FAILURE" 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 "Automated merge did not work."
		gettextln "Should not be doing an octopus."
		exit 2
	esac

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

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

if test "$common,$NON_FF_MERGE" = "$MRC,0"
	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 "Fast-forwarding to: \$pretty_name"
		git read-tree -u -m $head $SHA1 || exit
		MRC=$SHA1 MRT=$(git write-tree)
		continue
	fi

NON_FF_MERGE=1

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

MRC="$MRC $SHA1"
	MRT=$next
done

exit "$OCTOPUS_FAILURE"

Batal

⬅ libexec 166 item

Nama	Tipe	Ukuran	Diubah	Aksi
📁mergetools	dir	—	2026-03-11 18:53	📂 Buka
📄git	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-add	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-am	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-annotate	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-apply	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-archive	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-bisect	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-blame	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-branch	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-bugreport	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-bundle	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-cat-file	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-check-attr	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-check-ignore	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-check-mailmap	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-check-ref-format	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-checkout	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-checkout--worker	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-checkout-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-cherry	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-cherry-pick	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-clean	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-clone	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-column	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-commit	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-commit-graph	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-commit-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-config	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-contacts	file	4.4 KB	2025-06-13 22:20	✏️ 👁️
📄git-count-objects	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-credential	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-credential-cache	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-credential-cache--daemon	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-credential-netrc	file	10.7 KB	2025-07-21 16:25	✏️ 👁️
📄git-credential-store	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-describe	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-diagnose	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-diff	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-diff-files	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-diff-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-diff-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-difftool	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-difftool--helper	file	2.8 KB	2025-07-21 16:25	✏️ 👁️
📄git-fast-export	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fast-import	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fetch	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fetch-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-filter-branch	file	15.5 KB	2025-07-21 16:25	✏️ 👁️
📄git-fmt-merge-msg	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-for-each-ref	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-for-each-repo	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-format-patch	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fsck	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fsck-objects	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-fsmonitor--daemon	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-gc	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-get-tar-commit-id	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-grep	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-hash-object	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-help	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-hook	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-http-backend	file	795.9 KB	2025-07-21 16:25	✏️ 👁️
📄git-http-fetch	file	874.4 KB	2025-07-21 16:25	✏️ 👁️
📄git-http-push	file	1.2 MB	2025-07-21 16:25	✏️ 👁️
📄git-imap-send	file	857.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-index-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-init	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-init-db	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-interpret-trailers	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-log	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-ls-files	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-ls-remote	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-ls-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-mailinfo	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-mailsplit	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-maintenance	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-base	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-file	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-octopus	file	2.4 KB	2025-07-21 16:25	✏️ 👁️
📄git-merge-one-file	file	3.6 KB	2025-07-21 16:25	✏️ 👁️
📄git-merge-ours	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-recursive	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-resolve	file	1.2 KB	2025-07-21 16:25	✏️ 👁️
📄git-merge-subtree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-merge-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-mergetool	file	11.4 KB	2025-07-21 16:25	✏️ 👁️
📄git-mergetool--lib	file	10.5 KB	2025-07-21 16:25	✏️ 👁️
📄git-mktag	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-mktree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-multi-pack-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-mv	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-name-rev	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-notes	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-pack-objects	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-pack-redundant	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-pack-refs	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-patch-id	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-prune	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-prune-packed	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-pull	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-push	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-quiltimport	file	3.6 KB	2025-07-21 16:25	✏️ 👁️
📄git-range-diff	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-read-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-rebase	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-receive-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-reflog	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-refs	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-remote	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-remote-ext	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-remote-fd	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-remote-ftp	file	911.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-remote-ftps	file	911.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-remote-http	file	911.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-remote-https	file	911.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-repack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-replace	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-replay	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-request-pull	file	4.1 KB	2025-07-21 16:25	✏️ 👁️
📄git-rerere	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-reset	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-restore	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-rev-list	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-rev-parse	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-revert	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-rm	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-send-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-sh-i18n	file	1.6 KB	2025-07-21 16:25	✏️ 👁️
📄git-sh-i18n--envsubst	file	770.7 KB	2025-07-21 16:25	✏️ 👁️
📄git-sh-setup	file	8.2 KB	2025-07-21 16:25	✏️ 👁️
📄git-shell	file	770.7 KB	2025-07-21 16:25	✏️ 👁️
📄git-shortlog	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-show	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-show-branch	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-show-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-show-ref	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-sparse-checkout	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-stage	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-stash	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-status	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-stripspace	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-submodule	file	10.8 KB	2025-07-21 16:25	✏️ 👁️
📄git-submodule--helper	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-switch	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-symbolic-ref	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-tag	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-unpack-file	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-unpack-objects	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-update-index	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-update-ref	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-update-server-info	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-upload-archive	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-upload-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-var	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-verify-commit	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-verify-pack	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-verify-tag	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-version	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-web--browse	file	4.3 KB	2025-07-21 16:25	✏️ 👁️
📄git-whatchanged	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-worktree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄git-write-tree	file	4.1 MB	2025-07-21 16:25	✏️ 👁️
📄scalar	file	819.3 KB	2025-07-21 16:25	✏️ 👁️

✏️ Rename