Hi,

On Mon, May 3, 2010 at 11:20 PM, Gelonida <gelonida@gmail.com> wrote:
quoted text
> 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.

quoted text
>> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html