All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Git List <git@vger.kernel.org>, Linus Torvalds <torvalds@osdl.org>
Subject: Re: Bad merging with stgit or git
Date: Tue, 21 Mar 2006 17:18:33 -0300	[thread overview]
Message-ID: <1142972313.4749.123.camel@praia> (raw)
In-Reply-To: <20060321193924.GD14579@fieldses.org>

Em Ter, 2006-03-21 às 14:39 -0500, J. Bruce Fields escreveu:
> On Tue, Mar 21, 2006 at 04:34:13PM -0300, Mauro Carvalho Chehab wrote:
> > It shouldn't have any conflicts here for Linus, since those patches came
> > from his tree.
> 
> What do you mean by "those patches came from his tree"?  If you're
> actually cherry-picking patches from his tree and applying them to
> yours, then you're not reproducing the same commits he has--you're just
> creating new commits that happen to have nearly identical content.
No, I'm not cherry-picking his patches. 

>From the discussions on git IRC, I think it may be caused by a bad
procedure when solving a conflict, after merging from Linus tree.

>From what I'm understanding now, I should do, when a conflict is
detected:

nano <files>
git-update-index <files>
git commit

Previously (at git 1.1.4), I was doing:
nano <files>
git commit <files>

git 1.2.4 don't allow this bad commit syntax anymore.

> 
> --b.
Cheers, 
Mauro.

  reply	other threads:[~2006-03-21 20:18 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-21 19:34 Bad merging with stgit or git Mauro Carvalho Chehab
2006-03-21 19:39 ` J. Bruce Fields
2006-03-21 20:18   ` Mauro Carvalho Chehab [this message]
2006-03-21 23:02     ` Junio C Hamano
2006-03-21 19:42 ` Linus Torvalds
2006-03-21 20:08 ` Petr Baudis
2006-03-21 20:37   ` Linus Torvalds
2006-03-21 20:57     ` Junio C Hamano

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=1142972313.4749.123.camel@praia \
    --to=mchehab@infradead.org \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /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.