Re: sending changesets from the middle of a git tree

From: Wolfgang Denk <wd@denx.de>
Date: Aug 17, 2005, 00:13 UTC
Message-ID: <20050817001308.ED487353CFD@atlas.denx.de>
In-Reply-To: <7vfytc9dzw.fsf@assigned-by-dhcp.cox.net>

Hello,

in message <7vfytc9dzw.fsf@assigned-by-dhcp.cox.net> you wrote:

Show 5 quoted lines

> 
> This is the kind of situation I used to have all the time when
> Linus was the maintainer and I was a contributor, when you look
> at "master" branch being the "maintainer" branch, and "pu"
> branch being the "contributor" branch.  Your work started at the

...

> your changes) "pu" rather than merge.  So I ran "git rebase":
> 
>     $ git checkout pu
>     $ git rebase master pu

How do you handle conflicts in such a situation?

For example, I get:

	-> git rebase master testing-NAND
	67a002cbe2b2850d76d797e679bc290a76666df6
	patching file common/cmd_nand.c
	Hunk #2 FAILED at 18.
	Hunk #3 succeeded at 335 (offset 1 line).
	1 out of 4 hunks FAILED -- saving rejects to file common/cmd_nand.c.rej
	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?

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
...when fits of creativity run strong, more than  one  programmer  or
writer  has  been  known to abandon the desktop for the more spacious
floor.                                             - Fred Brooks, Jr.