Sourcetree always thinks .nuspec files have changed between branches

Hi,

We have a set of files in our project that always cause trouble when switching between branches.

I have just switched from our "develop" branch to the "master" branch, but when I try to pull down the changes in "master" branch, I get:

error: Your local changes to the following files would be overwritten by merge:
packages/SgmlReader.1.8.8/SgmlReader.1.8.8.nuspec
packages/SlowCheetah.2.5.5/SlowCheetah.2.5.5.nuspec
packages/Topshelf.3.1.0/Topshelf.3.1.0.nuspec
packages/Topshelf.NLog.3.1.0/Topshelf.NLog.3.1.0.nuspec
packages/WebActivator.1.5.3/WebActivator.1.5.3.nuspec
Please, commit your changes or stash them before you can merge.
Aborting

When I try to diff any of those files, there is actually no difference. I have checked with a hex editor and they are binary equal.

I try to create a stash, but the files still appear in my Pending Files list. I have to commit the "change" before I can pull down the actual changes for the branch.

Any suggestions?

Thanks

1 answer

Have you tried discarding the "change" instead of stashing it? If they're binary-equal, it shouldn't matter.

I'm guessing there is just some file metadata being changed, most likely the last-modified timestamp.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

229 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot