Bitbucket CRLF issue?
<p><strong>Issue:</strong> 
Bitbucket shows that the entire file has changed even though I dont see any differences. And there are no merge conflicts in these files.</p>

<p><strong>Details:</strong>
I created a sprint branch (named "sprintbranch") and the developers created a feature branch(named "featurebranchX") from the sprint branch. I started merging feature branches back to the sprint branch as and when features were implemented. Now there are two scenarios where I face an issue:</p>

<ol>
<li>Developer creates a pull request to merge featurebranch1 into sprintbranch</li>
<li>If there are merge conflicts, developer merges sprintbranch into featurebranch1 and creates a pull request to merge featurebranch1 into sprintbranch.</li>
</ol>

<p>Both times bitbucket shows that the entire file has changed. And there are no merge conflicts.</p>

<p>When this happens, I cannot do a code review since I dont know what specific lines have been modified by the developer. Also I lose history at this point - looking back I wont be able to figure out what was implemented or merged into the sprint branch.</p>

<p>My guess is that the issue is with line endings. Something to do with CRLF. But when I commit my work I do see that the appropriate line endings are being used automatically (either by git or by the tool like SmartGit)</p>

<p>How do I resolve this so it doesnt keep happening?</p>

<p><strong>Update:</strong></p>

<p>I just found out that I can append a query string <code>w=1</code> at the end of a url of a pull request to ignore cr lf differences.</p>

<p>But these files are still there in the commit and when I do merge it back, it will include those differences right?</p>