On Sep 1, 2009, at 4:07 AM, Bernt Hansen wrote:
Nick Dokos writes:
Thomas S. Dye wrote:
git pull counts, compresses, receives objects, resolves deltas,
updates and fails with this message:
error: Entry 'Makefile' not uptodate. Cannot merge.
As far as I know Makefile is up-to-date.
You m
Bernt Hansen wrote:
> Nick Dokos writes:
>
> > Thomas S. Dye wrote:
> >
> >> git pull counts, compresses, receives objects, resolves deltas,
> >> updates and fails with this message:
> >>
> >> error: Entry 'Makefile' not uptodate. Cannot merge.
> >>
>
> >
>
> There's a description of how
Nick Dokos writes:
> Thomas S. Dye wrote:
>
>> git pull counts, compresses, receives objects, resolves deltas,
>> updates and fails with this message:
>>
>> error: Entry 'Makefile' not uptodate. Cannot merge.
>>
>> As far as I know Makefile is up-to-date.
>>
> You might also want to have a
