Git keeps obsolete files

0 votes

I've been having problems with git on Windows for a few days now:

git version 2.36.2.windows.1

In conjunction with Microsoft Azure DevOps Server 2019.

When I pull or merge, it occasionally keeps the obsolete/older file. 

It looks like git is not only checking the hash, but also somehow the timestamp and it got messed up. 

I now have a clean working tree, but the remote file differs from my local copy of the same commit hash.

How does it happen?

Example:

git fetch origin
git checkout test
git pull origin test

Then it says: Already current. 

However, when I do:

git diff --name-only origin test

Then I get a lot of files that are different.

Dec 20, 2022 in DevOps on Cloud by Damonlang
• 900 points
51 views

No answer to this question. Be the first to respond.

Your answer

Your name to display (optional):
Privacy: Your email address will only be used for sending these notifications.

Related Questions In DevOps on Cloud

0 votes
0 answers

Git keeps prompting me for a password

I've been using Git for a while ...READ MORE

Dec 15, 2022 in DevOps on Cloud by Nicholas
• 7,760 points
145 views
0 votes
0 answers

Logon failed, use ctrl+c to cancel basic credential prompt to Git in Azure DevOps

When I clone a git repository from Azure Repos into my local system, the clone succeeds, however I receive the following message: Logon failed, use ctrl+c to cancel basic ...READ MORE

Dec 15, 2022 in DevOps on Cloud by Nicholas
• 7,760 points
151 views
0 votes
0 answers
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 27, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
2,354 views
0 votes
1 answer
–1 vote
0 answers
+1 vote
2 answers

Should I commit Terraform State files to the git repository?

Its better not to commit it to ...READ MORE

answered Aug 3, 2018 in DevOps & Agile by Nilesh
• 7,040 points
2,512 views
0 votes
1 answer

git - show modified files, except for deleted (or renamed) files

You can use --diff-filter=dr to exclude delete ...READ MORE

answered Aug 14, 2018 in Git & GitHub by Kalgi
• 52,350 points
2,094 views
webinar REGISTER FOR FREE WEBINAR X
REGISTER NOW
webinar_success Thank you for registering Join Edureka Meetup community for 100+ Free Webinars each month JOIN MEETUP GROUP