Re: Strange merge conflicts against earlier merge.

From: Petr Baudis <pasky@suse.cz>
Date: Nov 11, 2005, 13:12 UTC
Message-ID: <20051111131200.GS30496@pasky.or.cz>
In-Reply-To: <20051111114511.GQ30496@pasky.or.cz>

Dear diary, on Fri, Nov 11, 2005 at 12:45:11PM CET, I got a letter where Petr Baudis <pasky@suse.cz> said that...

Show 16 quoted lines

> I guess I really don't want to do that, but instead choose one of the
> bases. Hmm. Well, I suppose it's as good as anything to leave this
> decision on the user. Kind of:
> 
> 	if [ $(wc -l merge-bases) -ge 1 ]; then
> 		echo "Multiple merge bases, please select one by the -b parameter:" >&2
> 		cat merge-bases
> 		echo -n "The most conservative base (but likely a lot of conflicts):" >&2
> 		while true; do
> 			git-merge-base --all $(cat merge-bases) >merge-bases~
> 			mv merge-bases~ merge-bases
> 			[ $(wc -l merge-bases) -eq 1 ] && break
> 		done
> 		cat merge-bases
> 		exit 1
> 	fi

I just did something in this style. Since I'm unable to get the repository, could someone please test it?

I'll try to come up with some automated testcase later.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.