From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 05 May 2010 13:19:10 GMT
Subject: Re: how to squash a few commits in the past
Message-ID: <w2zf3271551005050619td67d697y97d7e9181c4496fc@mail.gmail.com>
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