• Community
  • Products
  • Sourcetree
  • Questions
  • When I download the metadata from salesforce and copy over the local git repository, sourcetree show every files are different event the code are the same.

When I download the metadata from salesforce and copy over the local git repository, sourcetree show every files are different event the code are the same.

Every time I download the metadata from salesforce and try to merge it back into local Bitbucket branch, the sourcetree show all my files are different even there are no code changes in the comparison. How do I resolved this issue? This issue is in Windows version of sourcetree, but I do not have the same issue in Mac.

2 answers

This widget could not be displayed.

when you do diff ,what does it show ?

I would check if the new line character is causing the difference .

https://help.github.com/articles/dealing-with-line-endings/

This widget could not be displayed.

Yes, it's definitely a difference in white space, most likely the line endings (which are different on Windows computers than on unix-based computers such as Macs and, presumably, your server).

You can tell SourceTree to ignore changes in whitespace.  I think it will still list the files as changed but it at least won't show the lines as changed in the diff view.

Screen Shot 2016-02-10 at 9.53.12 AM.png

 

Suggest an answer

Log in or Sign up to answer
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...

879 views 2 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