From: Daniel Barkalow <barkalow@iabervon.org>
Date: Fri, 04 Apr 2008 16:30:46 GMT
Subject: Re: newbie with broken workflow
Message-ID: <alpine.LNX.1.00.0804041228250.19665@iabervon.org>
In-Reply-To: <9d27c6320804040708l6eace184q9677ca75729b4eef@mail.gmail.com>

On Fri, 4 Apr 2008, James Kingston wrote:

> On Thu, Apr 3, 2008 at 7:05 PM, Daniel Barkalow <barkalow@iabervon.org> wrote:
> >  /c/wd/cc> cd /c/cc
> >  /c/cc> git pull ../wd/cc
> >
> >  But wouldn't that fail, because the files are read-only?
> 
> Actually, I just tried and it worked beautifully.  The directory is
> writable, so git replaces rather than modifies the files.  Then I can
> use CCRC to search for hijacked files, check them out in one swoop
> with the option to keep my modifications, then check them all in as a
> group.

Ah, yes, I guess that would work. Although I suspect that it would be 
annoying to recover if you failed to get the locks for any of them, since 
you're missing CC's expected path for conflict resolution.

	-Daniel
*This .sig left intentionally blank*