All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: 'git notes merge' implementation questions
Date: Wed, 21 Apr 2010 19:26:41 -0500	[thread overview]
Message-ID: <20100422002641.GA29452@progeny.tock> (raw)
In-Reply-To: <201004220155.12747.johan@herland.net>

Johan Herland wrote:

> Thanks, I'm definitely coming around to the idea that having the user freely 
> resolve conflicts in a temporary worktree (that preferably contains only the 
> conflicting notes) is better than trying to resolve conflicts _without_ a 
> worktree.

Junio did a good job of making both interfaces --- no-resolution and
resolution-in-a-worktree --- sound very appealing.

Thanks for the hard work,
Jonathan

  reply	other threads:[~2010-04-22  0:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-21  7:57 'git notes merge' implementation questions Johan Herland
2010-04-21 17:12 ` Jonathan Nieder
2010-04-21 23:55   ` Johan Herland
2010-04-22  0:26     ` Jonathan Nieder [this message]
2010-04-21 21:29 ` Junio C Hamano
2010-04-22  0:08   ` Johan Herland
2010-04-22  0:12     ` Junio C Hamano
2010-04-22  8:34       ` Johan Herland
2010-04-22  0:19     ` Junio C Hamano
2010-04-22  8:38       ` Johan Herland

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=20100422002641.GA29452@progeny.tock \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johan@herland.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.