Re: Git merge conflicts and encoding of logs

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Dec 23, 2008, 08:41 UTC
Message-ID: <4950A422.5030100@viscovery.net>
In-Reply-To: <7vprjjfgi7.fsf@gitster.siamese.dyndns.org>

Junio C Hamano schrieb:

Show 12 quoted lines

> <<<<<<< HEAD:foo
> これはサイドブランチの変更です。
> やはり JIS コードで書いてます。
> =======
> 日本語のファイルです。
> JIS コードで書いてます。
>>>>>>>> master:foo
> 
> The above will probably come out as UTF-8 in this mail text, but the point
> is that the confict side markers do not have anything but filename and the
> branch name.  I am still scratching my head trying to see where in the
> merge-recursive codepath you got snippet of log message.

Try rebase -i instead of merge: This should put summary lines onto the conflict markers.

-- Hannes