Reputation: 93
My local branch is up-to-date with origin/master and I think I was committing and pushing to my github while not in the within git but it has been sending it to my master branch just fine and it is entirely current with my local files.
For some reason, my git terminal is telling me that I have tons of changes to be committed and not staged changes, etc. yet everything is up-to-date with my master so I have no idea what's going on. My github commits have been going through just fine using git (as can be seen here): https://i.sstatic.net/BzX23.png but this is what my git terminal looks like right now: https://i.sstatic.net/IfxqE.png
(Sorry if this is unclear, I'm having trouble understanding what's going on so it's hard to explain that well what is going on. Let me know if you need any additional information.)
Thanks
Upvotes: 0
Views: 1257
Reputation: 2654
Do git fetch
to synchronize your remote branch origin/master with your github branch.
You can also force to synchronize your local copy with your github branch by using git reset --hard origin/master
(after doing the git fetch
). Take care: this method will remove every modifications you made not committed.
Upvotes: 1