← Back to team overview

kicad-developers team mailing list archive

Re: GAL edit merges


On 11/01/2011 05:24 AM, Torsten Hüter wrote:
> Hi Dick,
> that shouldn't be a problem 

(for you)  :)

> - I'm just a bit busy at the moment.
> I hope that I find at the weekend some time to upload and merge the 
> recent version, because I've made also a lot of changes.
> Thanks,
> Torsten

I just wanted to give you heads up.  Merging code is not fun for me, so I assumed it would
not be fun for you.

Hopefully BZR does most of the hard work.  In general I find it is better not to diverge
too far however, since that usually means less manual work.  Of course by "not diverging
too far", this means coming back to a common repo with commits and merges on a smaller
changes, frequent commits, basis.

My message is not specific to this repo, and this is why I am posting this.  I can
remember last year how a developer thought he'd go off and rewrite PCB, with a view to
merge all this code back into our tree in one big commit.  It never happened, because it
was not coming to us in bite sized, digestible chunks.


Follow ups