Re: Subversion merge minified javascipt shows conflict

2014-02-02 Thread Thorsten Schöning
Guten Tag Kamal Ahmed, am Samstag, 1. Februar 2014 um 09:46 schrieben Sie: > When I do a diff $REPO1/file $REPO2/file, svn diff $REPO1/file > $REPO2/file or do the same diff operation with the minified version > of the same file, I get no differences. Sounds like you are comparing both files @HEA

Subversion merge minified javascipt shows conflict

2014-02-02 Thread Kamal Ahmed
When I do a diff $REPO1/file $REPO2/file, svn diff $REPO1/file $REPO2/file or do the same diff operation with the minified version of the same file, I get no differences. But, when I do an svn merge $REPO2, while in the $REPO1 fresh checked out directory, I get an svn conflict. Does subversi