It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage
  • 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.

David Wong Feb 10, 2016

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

1 vote
sreekumar menon Feb 10, 2016

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/

0 votes
Tim Crall Feb 10, 2016

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
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

465 views 0 9
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you