Re: [PATCH] GnuTLS support on Woe32

[Eli Zaretskii]

> From: Ted Zlatanov <address@hidden>
> Date: Fri, 15 Apr 2011 13:14:36 -0500
> 
> *sigh* one more rebase...

If you have a separate branch (i.e. one that is not bound to the
remote trunk), then you don't need to rebase at all.  Just wait until
the paperwork is done, and then simply merge from that branch onto
your trunk mirror; then commit.

Bazaar (and other dVCSs) does a much better job tracking changes in
each branch, so merge conflicts are very rare, unless someone actually
changes the same lines that you did.