"pradeep singh" <pradeep.rautela@xxxxxxxxx> writes:
>> 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.
"changed" meaning you did:
$ cd /mnt/reiser/project
right?
>> i did a git-pull ssh://user1@xxxxxxxxxxxxx/opt/test/project test .[to
>> pull from another test machine].
It is not clear if this "another test machine" is the "remote
repo with printk" you earlier talked about. Are they the same?
I am assuming they are. What was the command? Was
$ git-pull ssh://user1@xxxxxxxxxxxxx/opt/test/project test .
what you typed (I am hoping that you did not give the extra " ."
at the end)?
>> I got some conflicts in a file but in some important files it
>> did not update it.
You earlier talked about "printk's to a file" in the remote, and
then you talk about two other classes of files. How are they
related? Is the "files it did not update it" being "important"
a helpful information to diagnose this issue?
Getting conflicts is perfectly normal. If you changed something
and the branch you are pulling from changed the area nearby, you
would get conflicts and need to resolve. Are you saying the
file you got conflict in should not have get conflicts? If so,
what makes you think so? They did not see parallel developments
while they diverged?
It also is perfectly normal if "git-pull" does not rewrite every
file in your work tree. If a file was modified by you (in the
repository /mnt/reiser/project) since the history diverged from
the history "another test machine" has, while the repository on
that another test machine did not modify that file in any way,
the merge result is _your_ version and in such a case "git-pull"
will keep your copy intact.
What made you think that some files that were not updated should
have been updated? IOW, are you sure they should have been
updated while git did not update them? What error messages did
you get when you did the above "pull"? What did they say?
> What is happening here? :-/
>
> I am puzzled.
> Can anybody please help me???
Sorry, you provided too little information to start even
speculating if there is anything wrong going on, let alone
diagnosing if there indeed is something wrong.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
