Unable to update the repository - Uncommited changes

[Asier Rodriguez]

Hello to all!

I have been doing some changes into a repository I'm working at and I want to upload them correctly for my whole working team to be able to access them.

The problem appears in this very moment, since I have done it from a Virtual Machine and the changes do not seem to update accordingly when I do so from another host. The situation is the one appearing on the screenshot and I want main to be in-line with the origin tags. How can I do so?

Whenever I perform Pull the system gives an error regarding the signed certificate, whereas Merge performed right on the first branch deploys another error due to uncommited changes that I have already done in the previous commit.

Any comment/advise is appreciated, since it is a problem that appears quite frequently.

Thanks in advance!

[Martin Runge · Accepted solution]

Hi @Asier Rodriguez

Two separate things are happening here, and I would tackle them in order.

The pull error is not a Git problem. Your remote is Azure DevOps, and the self-signed certificate in the certificate chain message almost always comes from a corporate proxy or antivirus doing TLS inspection on that VM. I would ask IT for the company root CA file and point Git at it instead of disabling verification, in Sourcetree under Tools > Options > Git, or on the command line with git config --global http.sslCAInfo <path-to-ca.pem>.

The merge error is different. Those .fmu, .slx, and .csv files exist untracked in your working copy and also exist in the incoming commits, so Git refuses to overwrite them. I would move that folder aside, run the merge again, then compare. If those files are generated model outputs, they probably belong in .gitignore rather than in the repo.

Cheers, Martin

[Asier Rodriguez]

Thanks for the input Martin. I will take that into account for the future.

As for the moment, what I'm doing is to delete the ones that are reporting an error/discarding the changes made since it has to do more with internal testing for keeping the same paths.

I will come back in case any further issue appears