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 Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

423 views 0 1
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