From: Jon Smirl <jonsmirl@gmail.com>
Date: Tue, 04 Nov 2008 14:50:33 GMT
Subject: Re: Stgit and refresh-temp
Message-ID: <9e4733910811040650k2b63856fpf20f4b654780c658@mail.gmail.com>
In-Reply-To: <9e4733910811040538v604d33e3jf0b312d809630af2@mail.gmail.com>

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@gmail.com> 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@gmail.com
>



-- 
Jon Smirl
jonsmirl@gmail.com