I think I fixed my tree up. After a stg repair I was able to delete 'refresh-temp' which was empty, then apply the changes to jds-lirc. It may have been possible to make the merge smarter. The conflicts were with things in the popped-off patches. Your typical end of file append merge conflicts. On Tue, Nov 4, 2008 at 8:38 AM, Jon Smirl <jonsmirl@xxxxxxxxx> wrote: > jonsmirl@terra:~/fs$ stg version > Stacked GIT 0.14.3.270.g0f36 > git version 1.6.0.3.523.g304d0 > Python version 2.5.2 (r252:60911, Oct 5 2008, 19:29:17) > [GCC 4.3.2] > jonsmirl@terra:~/fs$ > > -- > Jon Smirl > jonsmirl@xxxxxxxxx > -- Jon Smirl jonsmirl@xxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
