From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Gelonida <gelonida@gmail.com>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: how to squash a few commits in the past
Date: Wed, 5 May 2010 15:19:10 +0200 [thread overview]
Message-ID: <w2zf3271551005050619td67d697y97d7e9181c4496fc@mail.gmail.com> (raw)
In-Reply-To: <hrnem4$1m0$1@dough.gmane.org>
Hi,
On Mon, May 3, 2010 at 11:20 PM, Gelonida <gelonida@gmail.com> wrote:
> Is it normal, that git gets lost wehn rebasing such a structure.
While performing an interactive rebase, conflicts can often occur and
this is quite normal.
>> Automatic cherry-pick failed. After resolving the conflicts,
>> mark the corrected paths with 'git add <paths>', and
>> run 'git rebase --continue'
>> Could not apply 67f3f6d... preparation for #241
The problem and solution is described in that message. Open the file,
resolve the conflict and continue the rebase operation.
-- Ram
next prev parent reply other threads:[~2010-05-05 13:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 9:33 how to squash a few commits in the past Gelonida
2010-05-03 10:09 ` Michael J Gruber
2010-05-03 20:45 ` Gelonida
2010-05-03 20:55 ` Gelonida
2010-05-03 21:20 ` Gelonida
2010-05-05 13:19 ` Ramkumar Ramachandra [this message]
2010-05-05 21:41 ` Gelonida
2010-05-06 6:45 ` Johannes Sixt
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=w2zf3271551005050619td67d697y97d7e9181c4496fc@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=gelonida@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.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 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).