Wolfgang Denk <[EMAIL PROTECTED]> writes:
> external diff died, stopping at common/cmd_nand.c.
> Some commits could not be rebased, check by hand:
> 67a002cbe2b2850d76d797e679bc290a76666df6
>
> OK, I can edit the file to resolve the conflicts. But what do I do
> then to continue?
Your rebase failed while processing 67a002... and fortunately
(well, if you are really fortunate you would not have seem it)
"some commits could not be" message says that was the only one
left. At that point, everything up to that commit should be
migrated on top of your head. Run gitk or git show-branches to
see where the "master" head is. It should be pointing at the
last successful commit the rebase process has made. I guess in
your example you had one commit between master and testing-NAND,
in which case the master head does not have moved?
Anyway, you manually resolve conflicts and make an commit from
there, which would migrate the failed 67a002... commit on top of
your master branch. If "some commits could not be rebased"
message says more than one commit, you need to deal with the
rest of them by hand; sorry there is no automated way currently.
You have to repeat for each such commit:
(1) Run "git-diff-tree -p <commit-id> | git-apply --index" (or
what is in git-rebase-script which uses git-apply-patch-script);
(2) Resolve conflict if there is one;
(3) Run "git commit -C <commit-id>".
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
