On Thu, Feb 11, 2010 at 7:49 AM, Pierre Schmitz <[email protected]> wrote: > Am Donnerstag, 11. Februar 2010 14:45:38 schrieb Allan McRae: >> > +1 to this. >> >> Agree. Merge fails often enough that I end up doing that anyway... > > and it gets so much easier: > http://projects.archlinux.org/devtools.git/commit/?id=f09baea3922d6c9365d267700bafc5bf37338e0f > > Did I miss anything? Why did we use such a complex construct in the first > place?
It's one of those "mature code" things, where it started off at like 4-5 lines, then someone found a bug and we fixed it, etc etc Doing away with the merge solves all those issues though
