On Tue, Feb 26, 2013 at 6:35 PM, Brian Dolbec <[email protected]> wrote: > On Tue, 2013-02-26 at 20:40 -0500, W. Trevor King wrote: >> On Tue, Feb 26, 2013 at 05:30:40PM -0800, Brian Dolbec wrote: >> > My aim for now is to debug the hell out of it, to stabilize all the >> > existing changes, BEFORE doing a ton more changes. That will also give >> > me more experience in how catalyst is used, possibly ideas how to change >> > it for the better. I'll fix the doc's generation and make a setup.py >> > and new 9999 ebuild. >> >> I'm not suggesting additional changes on top of yours, I'm suggesting >> new ones underneath yours, or alternatives to your current series. It >> seems a shame to spend time testing a work in progress, since you'll >> probably want to re-test the final form before merging. I'm trying to >> help polish your series down before we invest a lot of time testing. >> > > NNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOO :( not more rebasing I spent > several days just tracking down and fixing rebase errors. Fix a few, > that in turn caused more errors...
Rebasing can be annoying, but isn't inherently difficult. Typically you don't rebase until you're ready for others to review and commit them. I'm curious if you know how to use interactive rebase to apply fix-ups to commits? If not, I'll be happy to walk you through it. It greatly simplifies the workflow.
