From: "Emmanuel Guerin" <emmanuel@guerin.fr.eu.org>
To: git@vger.kernel.org
Subject: Re: Quick question: end of lines
Date: Wed, 1 Mar 2006 01:12:36 +0100 [thread overview]
Message-ID: <f898cca90602281612n777a4f17m@mail.gmail.com> (raw)
In-Reply-To: <46a038f90602281215n259066b1qe2e6421625b82e75@mail.gmail.com>
2006/3/1, Martin Langhoff <martin.langhoff@gmail.com>:
> Why is this important?
>
> (I am thinking: any reasonably good text editor will know how to deal
> with unix newlines, but you may have different reasons).
Actually, you have found the problem. My particular setup is that
Visual Studio is used on Windows. The editor will handle unix end of
lines all right, but tends to insert windows ones when modifications
are made. This leads to files with inconsistent end of lines, and
nightmares with merges. We use Subversion for the moment, and we have
to make sure that all text files are declared properly in svn to avoid
conflicts.
What I begin to realize is that the only possibility probably lies in
using a tool that converts the modified files "on the fly" before
commits. I just want to make sure that no other solution was found by
others facing a similar problem.
Anyway, thanks for the answers,
Emmanuel
next prev parent reply other threads:[~2006-03-01 0:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-28 18:32 Quick question: end of lines Emmanuel Guerin
2006-02-28 20:07 ` Johannes Schindelin
2006-02-28 20:15 ` Martin Langhoff
2006-03-01 0:12 ` Emmanuel Guerin [this message]
2006-03-01 8:31 ` Martin Langhoff
2006-03-01 9:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f898cca90602281612n777a4f17m@mail.gmail.com \
--to=emmanuel@guerin.fr.eu.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).