[chef] Re: Re: RE: Re: site installing tomcat cookbook git deleted files from my java cookbook

[AJ Christensen < >]

Don't forget you can always use the git reflog to find the ref of a
commit that you.. misplaced? It's local to the repository.

--AJ

On 13 January 2012 05:27, Andrea Campi 
<
 >
 wrote:
>
>
> On Thu, Jan 12, 2012 at 4:53 PM, RUSSELL Scott
> <
 >
>  wrote:
>>
>> Andrea,
>>             I think I had a similar issue, where initially on the master
>> branch, I just copied the java cookbook into place on the filesystem(no
>> knife command at all).  I subsequently did as you did and used knife to
>> install the cookbook, which created the vendor branches and then does a
>> merge to master(seemingly overwriting the java cookbook, that I had 
>> manually
>> installed initially).   I never did track it down, as I had a backup of the
>> repo anyway, and just did my own merge.    Maybe you did something similar
>> initially?
>>
>
> All the quoting made the thread difficult to follow, it was kallen who had
> the issue :)
> But yeah, that's what I thought too. And as Daniel said, the history is
> still there, just reverting (part of) a commit should get everything
> back—and it will not happen again after that.