From: Martin Langhoff <martin.langhoff@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: What is the status of merging with whitespace conflicts?
Date: Wed, 2 Dec 2009 11:34:16 +0100 [thread overview]
Message-ID: <46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com> (raw)
A project I hack on [Moodle] is relatively lax when it comes to
trailing whitespace (relatively: we clean it up when we spot it,
sometimes ws sneaks in!).
Most of the time, this has no impact. If you have done some whitespace
cleanups on your branch, however, merging from upstream means endless,
pointless conflicts. Looking at the git merge manpage, and searching
the archives doesn't show anything promising.
Perhaps we have a merge tool that makes it easy to spot-and-resolve
pure whitespace conflicts? In the middle of the merge, there _are_
some actual code conflicts, but it's hard to see them...
cheers,
m
--
martin.langhoff@gmail.com
martin@laptop.org -- School Server Architect
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
next reply other threads:[~2009-12-02 10:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 10:34 Martin Langhoff [this message]
2009-12-02 17:04 ` What is the status of merging with whitespace conflicts? 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=46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com \
--to=martin.langhoff@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).