HazelnootMar 19, 2024
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???? ​​

Update: I figured it out! One of the repositories had an extra remote defined, and it was pointing to a random old fork. Guess which remote was set as upstream for the stable branch? ​​

#Programming #SoftwareDev #Coding #Git
Show threadHazelnoot
This is actively breaking things on my instance because half the API files have random changes that git somehow doesn't see. pls help ​​

#FediAdmin #FediAdmins #AdminSupport
Mar 19, 2024 at 2:24amWeb
Show threadGeorge BuddMar 19, 2024
@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
Show threadHazelnootMar 19, 2024
@Gbudd 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.
Show threadGeorge BuddMar 19, 2024
@hazelnoot Awesome! Glad it worked out