From: skillzero@gmail.com
To: git@vger.kernel.org
Subject: Retry conflicting merge with matching line endings?
Date: Tue, 17 Feb 2009 17:55:42 -0800 [thread overview]
Message-ID: <2729632a0902171755n3e89e717p6b3a38b556252bfb@mail.gmail.com> (raw)
I've been running into a lot of merge conflicts due to line endings
changing. For example, I branch from master when a file has CRLF line
endings (incorrectly) then somebody fixes a bug in that file (still
has CRLF line endings) on master then I realize the file should have
LF line endings so I change them. When I try to rebase on master
later, I get a merge conflict because it looks like every line has
changed and it conflicts with that other bug fix.
Would it be reasonable that if you get a conflict during a merge and
the line endings of the two commits are different then change the line
endings to match, retry the merge of that file, then apply the line
ending change commit?
next reply other threads:[~2009-02-18 1:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-18 1:55 skillzero [this message]
2009-02-18 2:18 ` Retry conflicting merge with matching line endings? Junio C Hamano
2009-02-18 3:44 ` skillzero
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=2729632a0902171755n3e89e717p6b3a38b556252bfb@mail.gmail.com \
--to=skillzero@gmail.com \
--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).