Home > IT Support, Uncategorized, Unix > SVN conflict on all lines (LF), while edit a file using Windows then Unix (Mac, Ubuntu)

SVN conflict on all lines (LF), while edit a file using Windows then Unix (Mac, Ubuntu)

This is a work around for a problem of committing changes to subversion using multiple operating system and the end of the line conflict.

If you collaborate on a text file or a source code file while multiple people editing the file using Windows and Unix (or Mac),

you might face a challenge for committing changes to subversion.

The problem is the conflict on all lines each time a file edited with Unix then Windows, and vise versa.

To resolve this issue use the following terminal comments to edit the property of the text (source code) file.


svn propset "svn:eol-style" "native" file1.txt

Reference: Red Bean File Property

Advertisements
  1. No comments yet.
  1. No trackbacks yet.

Leave a Reply

Please log in using one of these methods to post your comment:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: