Re: Merged branch with history

[Dustin J. Mitchell]

On Mon, Aug 3, 2009 at 5:05 AM, Peter Simons<address@hidden> wrote:
> okay, please push your changes.

Done.

The 'maint' branch still exists, but should probably be deleted.
Peter, since you're doing most of the work on that branch, I'll leave
it to you to merge any unfinished work into master and delete the
'maint' branch, ok?  The only trickery I found with merging is that
when an update to the 'm4' submodule link is merged, it conflicts with
the directory in a way that's not easy to fix.  My solution was to
move the m4 directory (not the submodule link!) out of the way, 'git
rm m4', then move it back and 'git add m4'.  Git quickly figured out
that nothing had changed and went merrily on its way.

Dustin

-- 
Open Source Storage Engineer
http://www.zmanda.com