Re: [Gnu-arch-users] Re: diff markers/ star merge

[Zenaan Harkness]

On Mon, 2004-11-22 at 09:54, Samuel Tardieu wrote:
> >>>>> "Zenaan" == Zenaan Harkness <address@hidden> writes:
> 
> Zenaan> So, I want to undo, star-merge in $stable, then commit (!),
> Zenaan> then redo so I can continue on. Except I want in-file diff3
> Zenaan> markers when I redo, because my change touches hundreds of
> Zenaan> files.
> 
> Why not commit your work into another branch, so that you can make
> sure that you do not loose any of your work (should you realize that
> you need some other modifications before merging to ease the merge)
> and then use star-merge between your star-merged-from-upstream branch
> and your development branch?

Well that might be a good idea, except I've never done that before (just
had development trees against my branch, and the upstream stable/pivot
branch).

I'll look into it, thanks
Zenaan