Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/git-merge-resolve.sh
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
executable file
54 lines (50 sloc)
944 Bytes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
# | |
# Copyright (c) 2005 Linus Torvalds | |
# Copyright (c) 2005 Junio C Hamano | |
# | |
# Resolve two trees, using enhanced multi-base read-tree. | |
# 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 | |
# Give up if we are given two or more remotes -- not handling octopus. | |
case "$remotes" in | |
?*' '?*) | |
exit 2 ;; | |
esac | |
# Give up if this is a baseless merge. | |
if test '' = "$bases" | |
then | |
exit 2 | |
fi | |
git update-index -q --refresh | |
git read-tree -u -m --aggressive $bases $head $remotes || exit 2 | |
echo "Trying simple merge." | |
if result_tree=$(git write-tree 2>/dev/null) | |
then | |
exit 0 | |
else | |
echo "Simple merge failed, trying Automatic merge." | |
if git-merge-index -o git-merge-one-file -a | |
then | |
exit 0 | |
else | |
exit 1 | |
fi | |
fi |