From: Junio C Hamano <junkio@cox.net>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: git@vger.kernel.org
Subject: Re: Bad merging with stgit or git
Date: Tue, 21 Mar 2006 15:02:19 -0800 [thread overview]
Message-ID: <7vfylbcsg4.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <1142972313.4749.123.camel@praia> (Mauro Carvalho Chehab's message of "Tue, 21 Mar 2006 17:18:33 -0300")
Mauro Carvalho Chehab <mchehab@infradead.org> writes:
>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.
It is not a bad syntax, and it instead would say "you might have
meant to say -i paths...", and if you follow that suggestion to
say:
$ git commit -i this-and-that-file-I-resolved-by-hand
you would commit the cleanly auto-resolved paths _and_ the
result of your hand merge result. That is the same traditional
behaviour you are used to and is very convenient if you only had
a few paths to be hand resolved.
So I suspect there might be something else going on.
next prev parent reply other threads:[~2006-03-21 23:02 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
2006-03-21 23:02 ` Junio C Hamano [this message]
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=7vfylbcsg4.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=mchehab@infradead.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.