From: Bill Priest <priestwilliaml@yahoo•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: can't commit files that have been git add'ed because "fatal: you need to resolve your current index first"
Date: Fri, 30 Nov 2007 08:32:17 -0800 (PST) [thread overview]
Message-ID: <379331.84167.qm@web55014.mail.re4.yahoo.com> (raw)
On Wed, 28 Nov 2007 12:08:40 -0800
Junio C Hamano <gitster@pobox•com> wrote:
> You can still do that by hand, by doing something
like:
>
> $ git merge --squash A
> $ resolve only partly
> $ git commit -m 'Prepare to merge A'
> $ git reset --hard
> $ git merge A
> $ resolve the rest
> $ git commit -m 'Fully merged A'
>
> For such a multi-step merge to make sense, the
change between B---M
> should make sense by itself for people who have to
read such a history
> later. Such a half-a-squash-merge may probably not
make sense by itself
> in most cases, so I suspect the above workflow would
not be useful in
> general.
>
Junio,
I resolved all the merges and then committed
different files as groups to make it easy to
cherry-pick after this merge. Does this "mess up" the
merge info? What does the "git reset --hard" do after
the commit (I'm assuming it throws away the
non-resolved changes not committed)? But from my
experience git wouldn't let me do the commit above it
w/o first fixing the conflicts.
Am I mis-interpreting your example or are you saying
that you think git would let me do the commit w/o
resolving all conflicts?
Bill
____________________________________________________________________________________
Get easy, one-click access to your favorites.
Make Yahoo! your homepage.
http://www.yahoo.com/r/hs
next reply other threads:[~2007-11-30 16:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-30 16:32 Bill Priest [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-11-29 4:10 can't commit files that have been git add'ed because "fatal: you need to resolve your current index first" Bill Priest
[not found] <993937.9873.qm@web55013.mail.re4.yahoo.com>
2007-11-28 18:11 ` Jakub Narebski
[not found] <251604.8861.qm@web55007.mail.re4.yahoo.com>
2007-11-28 16:55 ` Jakub Narebski
2007-11-28 15:48 Bill Priest
2007-11-28 15:53 ` Jakub Narebski
2007-11-28 20:08 ` 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=379331.84167.qm@web55014.mail.re4.yahoo.com \
--to=priestwilliaml@yahoo$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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