Super User is a question and answer site for computer enthusiasts and power users. Join them; it only takes a minute:

Sign up
Here's how it works:
  1. Anybody can ask a question
  2. Anybody can answer
  3. The best answers are voted up and rise to the top

I am working in a place that develops software on Windows. We use SVN for version control. I work much more quickly in a bash shell, and was asked to do a merge of a tag into a branch. I automatically did it in a Linux VM as that's where I'm most at ease.

I have since done a diff of the merge and have seen a lot more changes than I expected. Is this a result of the differences between Windows and Unix (carriage-returns etc)?

Is there a way to avoid it or is it safer to just bite the bullet and do everything in Windows? I won't actually be developing any code inside this VM, I will only use it for merges and diffs.

share|improve this question

The diff itself should show what the changes are. I recommend getting a decent diff tool and see for yourself. Since you mention line endings: You can read more about line endings in SVN here.

share|improve this answer
Some text editors like Vim would show line endings, IIRC. Text files from Windows show up with things like ^M on Vim. A diff tool should still be able to do that work, too. – Isxek Apr 25 '12 at 13:21

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .