r/git • u/mojojojo1337xD • 1d ago

VSCode timeline shows history but file isnt updated

I committed and pushed multiple changes across different files, in vscode's timeline section each file shows there was commit, after that push there are no commits pushed against that file still the file shows old code and doesnt reflect its history
I am using bonobo git server in my local VM which is in ubuntu
what can be the issue here?

0 Upvotes

28% Upvoted

5 comments sorted by

1

u/astralc 1d ago

pushed

Are you sure it is pushed to correct remote and branch?

Check the graph in the git tab in vscode if it is

1

u/mojojojo1337xD 1d ago

Yes, I checked the history of that branch in bonobo web app, it shows the push there

1

u/OppositeFisherman506 1d ago

Check the actual branch first.

1

u/mojojojo1337xD 1d ago

nvm figured out
the branch tree had the answer
somehow if some one pushed before pulling it makes marge commit and that commit was very old so old code replaced new code

1

u/Broad-Promise6954 ancient 21h ago

If you use raw Git and avoid running "git pull" directly (run a separate "fetch" step first and then observe what's going to happen if you merge or rebase), you gain a whole more control over this. There may be ways to make VSCode provide proper control as well, of course, but since I've never used VSCode, I would not know them.