git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Junichi Uekawa <dancer@netfort.gr.jp>, git@vger.kernel.org
Subject: Re: Git merge conflicts and encoding of logs
Date: Tue, 23 Dec 2008 09:41:06 +0100	[thread overview]
Message-ID: <4950A422.5030100@viscovery.net> (raw)
In-Reply-To: <7vprjjfgi7.fsf@gitster.siamese.dyndns.org>

Junio C Hamano schrieb:
> <<<<<<< 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

  reply	other threads:[~2008-12-23  8:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-23  4:48 Git merge conflicts and encoding of logs Junichi Uekawa
2008-12-23  8:22 ` Junio C Hamano
2008-12-23  8:41   ` Johannes Sixt [this message]
2008-12-23 10:04     ` Junio C Hamano
2008-12-23 23:37       ` Junichi Uekawa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4950A422.5030100@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=dancer@netfort.gr.jp \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).