Re: Git pull fails on a repository > 1.5G.

["pradeep singh" <pradeep.rautela@gmail.com>]

PS:- please CC me , as i am not subscribed to git list.
On 9/17/07, pradeep singh <pradeep.rautela@gmail.com> wrote:
> Hi All,
>
> I am using git at work for a rather big repository. Size is around
> 1.5-1.8Gigs now.
> My git version is 1.5.2.4.
>
> The remote repo has some changes to a file with some simple printk's
> some some code changes.
>
> I have my git repo in /mnt/reiser/project .
>
> I changed to the my repo.
>
> i did a git-pull ssh://user1@10.100.205.34/opt/test/project test .[to
> pull from another test machine].
>
> I got some conflicts in a file but in some important files it did not update it.
>
> Any hints whats wrong with my technique or is there something wrong with git?

Just to add.
If i pull tags with
$git-pull ssh://user1@10.100.205.34/opt/test/project test
i get them.
doing a git-merge v-1.0b does not reflect any changes but a git-branch
new_test v-1.0b makes new_test branch which has the changes.
Again git-merge new_test fails miserably, it says no conflicts though
there are conflicts.

What is happening here? :-/

I am puzzled.
Can anybody please help me???

thanks

-- 
Pradeep