[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-zile] Rebasing Zi

From: Gary V. Vaughan
Subject: Re: [Bug-zile] Rebasing Zi
Date: Tue, 21 Feb 2012 20:40:17 +0700

Rebased and pushed zi again.

On 15 Feb 2012, at 16:18, Gary V. Vaughan wrote:
> Now that a fair amount of the keycode rework I did in the Zi branch
> has landed in the Lua branch, I've deleted the old long Zi branch (and
> multiple merges from the Lua branch) from the savannah git repo, and
> rebased just the differences over the HEAD of the lua branch.
> So the new Zi branch is much cleaner and shorter, and picks up all
> the fixes and improvements from the Lua branch without adding another
> merge commit :)

Only, it was *so* short that a couple of the mega-patches proved annoyingly
difficult to rebase again over the last week of work on the Lua branch,
so I've split them up into more pieces with the most recent rebase, in the
hope this makes the next rebase easier to do - instead of getting all the
conflicts at once! :)

While I was there, I also pushed my syntax-hilite branch (such as it is
so far) in case any one wants to point me in a different direction before
I get too far along this route.

Gary V. Vaughan (gary AT gnu DOT org)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]