ok uh... what do I do when git tries to gaslight me? These windows both show the same repository, but on two different machines. They are both up to date and checked out to the same commit on the same branch. They should have the same files, right?

Wrong! Somehow, this file has different contents between the computers. Am I hallucinating? What is happening???? ​:aqua_aaa:

#Programming #SoftwareDev #Coding #Git

This is actively breaking things on my instance because half the API files have random changes that git somehow doesn't see. pls help ​:aqua_cry:

#FediAdmin #FediAdmins #AdminSupport

Show thread
Follow

@hazelnoot I recently ran into this when I was pointed at an old remote (I had migrated and forgot to set-url on a local copy of the repo), not sure if it’s the problem you’re seeing but it flummoxed me for a bit when I did it

@Gbudd@qoto.org that actually was the issue! The older repository had a second remote, pointing to a random other repository. The "stable" branch was pointed to that remote somehow.

Sign in to participate in the conversation
Qoto Mastodon

QOTO: Question Others to Teach Ourselves
An inclusive, Academic Freedom, instance
All cultures welcome.
Hate speech and harassment strictly forbidden.