Doesn't pull All the files?

[KJL-294]

Select Topic Area

Question

Body

Ive setup a remote repo on github for my mac and windows computer to use, so I can push and pull code from it, However when I try to pull it doesnt update all my files, especially some that I have changed, any ideas?

[knarrff]

Hi @KJL-294 ,

it is hard to answer your question since you have given so little information. Here are a few questions which, when answering, might help discover the problem, but at this point this is a little like shooting in the dark:

• Are both clients on the same branch?
• Are both your clients on HEAD, that is: on the latest version of the branch?

Both these questions can be answered, e.g., on the command line using git status. If you can, you could share the output from that.

This command also would tell you other useful things to look out for, e.g., are there conflicts? Without any further information, this is one of the more likely reasons, but you should get an error message about that when you pull.

When you do git pull, are there any error messages? If so: what are they?

[KJL-294]

How do I make it so that they are? Or how do I check, I’m fairly sure they should be but would make sense if not

…

On Fri, 19 Jul 2024 at 17:02, Frank Löffler ***@***.***> wrote: Hi @KJL-294 <https://github.com/KJL-294> , it is hard to answer your question since you have given so little information. Here are a few questions which, when answering, might help discover the problem, but at this point this is a little like shooting in the dark: - Are both clients on the same branch? - Are both your clients on HEAD, that is: on the latest version of the branch? Both these questions can be answered, e.g., on the command line using git status. If you can, you could share the output from that. This command also would tell you other useful things to look out for, e.g., are there conflicts? Without any further information, this is one of the more likely reasons, but you should get an error message about that when you pull. When you do git pull, are there any error messages? If so: what are they? — Reply to this email directly, view it on GitHub <#132803 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BIDXRX37QDBPHFFLPEOGLWDZNE2BJAVCNFSM6AAAAABLEYY3ASVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTAMBZG4ZTGNY> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[KJL-294]

Sorry I only saw the first bit let me check now

…

On Fri, 19 Jul 2024 at 17:02, Frank Löffler ***@***.***> wrote: Hi @KJL-294 <https://github.com/KJL-294> , it is hard to answer your question since you have given so little information. Here are a few questions which, when answering, might help discover the problem, but at this point this is a little like shooting in the dark: - Are both clients on the same branch? - Are both your clients on HEAD, that is: on the latest version of the branch? Both these questions can be answered, e.g., on the command line using git status. If you can, you could share the output from that. This command also would tell you other useful things to look out for, e.g., are there conflicts? Without any further information, this is one of the more likely reasons, but you should get an error message about that when you pull. When you do git pull, are there any error messages? If so: what are they? — Reply to this email directly, view it on GitHub <#132803 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BIDXRX37QDBPHFFLPEOGLWDZNE2BJAVCNFSM6AAAAABLEYY3ASVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTAMBZG4ZTGNY> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[KJL-294]

There is one error when I pull and it’s fatal error unable to merge unrelated histories

…

On Fri, 19 Jul 2024 at 17:02, Frank Löffler ***@***.***> wrote: Hi @KJL-294 <https://github.com/KJL-294> , it is hard to answer your question since you have given so little information. Here are a few questions which, when answering, might help discover the problem, but at this point this is a little like shooting in the dark: - Are both clients on the same branch? - Are both your clients on HEAD, that is: on the latest version of the branch? Both these questions can be answered, e.g., on the command line using git status. If you can, you could share the output from that. This command also would tell you other useful things to look out for, e.g., are there conflicts? Without any further information, this is one of the more likely reasons, but you should get an error message about that when you pull. When you do git pull, are there any error messages? If so: what are they? — Reply to this email directly, view it on GitHub <#132803 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BIDXRX37QDBPHFFLPEOGLWDZNE2BJAVCNFSM6AAAAABLEYY3ASVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTAMBZG4ZTGNY> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[knarrff]

That is a strange one. It would suggest that you try to pull from a different repository that the current checkout was created from. This can happen for instance if you once deleted a project on github and later created a new one with the same name, but keeping a checkout of the old one on one of the clients. Another possibility is that you changed the remote URL on one of the clients at some point to point at an unrelated repository.

You should be able to see and compare the configured remotes on the clients using git remote -v.

Concerning unrelated history: usually (not always, but almost always), this should work and show the same output on all checkouts: git log --reverse --oneline | head -n. It does print the hash and log message of the first commit.

[KJL-294]

is this whats meant to come up?
should I use the same command on my pc and see if they match?
thanks

[knarrff]

Yes, this is one of the things that should match. The other is seeing if this matches too:
git log --oneline (and scroll down: look at the last line), or if that works in your command line: git log --oneline | tail -n 1 (which is the same as above but only displays the last line)

[KJL-294]

Ah could this be it then? This is on my pc im not sure why its Godot instead of master and im not sure how to change it

[knarrff]

I don't think this is the problem. The important part is the URLs. The first part up to the spaces is the name you use locally, which is up to you and should not cause any problem here. Now, what about the last line of git log --oneline for both: do they match?

[KJL-294]

[KJL-294]

[knarrff]

You see the two groups of numbers and letters at the beginning? (b6e7e95 and 0e665e2) They differ. Now, given the command line in this one and no obvious "cut", first double-check that both are really the first (in time) commits. Note that "git log --oneline" outputs in reverse order, so there the first commit would be the last line.

If you are sure to look at the first commit (the oldest), compare the two, and also compare them against what github thinks the first commit was. This way you might be able to get some clues as to what happened.

On the other hand, if you really don't mind about finding out which of them is currently 'wrong', are more keen on getting it fixed and do not have data locally that you couldn't save otherwise for a while, it might be easier to skip the investigation and instead start if a new clone on both clients, from the same repository. Just don't remove the old clones: just rename them: you'll never know what you might still need from them.

[KJL-294]

okay thank you, how would I go about cloning them? and making sure its from the same repo

[knarrff]

okay thank you, how would I go about cloning them? and making sure its from the same repo

The same way you cloned them initially: there are many ways to do this, depending on the tools you use. If you want to make sure you use the same repo, use the same URL when cloning. On the command line this would be
git clone URL where URL is the URL of your repository, but GUI tools allow you the same.

[KJL-294]

Ahh okay yes that makes sense thank you. I’ll try it now

…

On Wed, 24 Jul 2024 at 14:13, Frank Löffler ***@***.***> wrote: okay thank you, how would I go about cloning them? and making sure its from the same repo The same way you cloned them initially: there are many ways to do this, depending on the tools you use. If you want to make sure you use the same repo, use the same URL when cloning. On the command line this would be git clone URL where URL is the URL of your repository, but GUI tools allow you the same. — Reply to this email directly, view it on GitHub <#132803 (reply in thread)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/BIDXRX6KIYWNRTIED334GMLZN6R6DAVCNFSM6AAAAABLEYY3ASVHI2DSMVQWIX3LMV43URDJONRXK43TNFXW4Q3PNVWWK3TUHMYTAMJTG43DIMY> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[KJL-294]

Hey, sorry i got this error when trying to pull

[knarrff]

This indicates that you changed the file .gitignore locally while it was also changed on the remote site and git could not automatically merge the two. This typically happens when the lines of both changes were close to each other. See, e.g., https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line for how to resolve this. Essentially this boils down to opening the file in an editor, look for the <<<, >>>, and === markers and by hand remove them and things in between such that the state at the end is what the combined file should look like. Then as usual, "git add" the file and commit and then pull again.