From: Jeff King <peff@peff.net>
To: David Krmpotic <david.krmpotic@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: auto merge bug
Date: Wed, 6 Mar 2013 04:15:15 -0500 [thread overview]
Message-ID: <20130306091515.GC2018@sigill.intra.peff.net> (raw)
In-Reply-To: <CAOFaZ+4oUD7eMvFmtPdca4AYooxW-PCOiPBUb0jjVw4LPBN8+Q@mail.gmail.com>
On Tue, Mar 05, 2013 at 11:13:12PM +0100, David Krmpotic wrote:
> Hi guys! Thank you for responses.. I haven't suspected that repos
> created via GitHub windows app would have union set by default :( have
> to ask them about it.. it seems wrong to me… Here are the defaults for
> a windows repo created with GitHub for windows app:
> [...]
> # Custom for Visual Studio
> *.cs diff=csharp
> *.sln merge=union
> *.csproj merge=union
> *.vbproj merge=union
> *.fsproj merge=union
> *.dbproj merge=union
Yeah, I think defaulting to merge=union there is questionable. In an
ideal world, the GitHub for Windows folks would ship a specialized merge
helper for handling VS project files. It can be open-source and
distributed separately for people who don't use GitHub, but they can
integrate it seamlessly into the GitHub client. So everybody wins.
I see you've already written to GitHub support; thanks. I'll make sure
your issue gets routed to the right people, and I'll see if I can
convince them to write the specialized tool. :)
-Peff
prev parent reply other threads:[~2013-03-06 9:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-04 16:46 auto merge bug David Krmpotic
2013-03-05 9:03 ` Jeff King
2013-03-05 9:12 ` Jeff King
2013-03-05 15:44 ` Junio C Hamano
2013-03-05 17:59 ` Jeff King
2013-03-05 18:47 ` Junio C Hamano
2013-03-05 20:56 ` Andreas Ericsson
[not found] ` <194F685F-9460-42C6-B5A5-59475F53D038@gmail.com>
2013-03-05 22:13 ` David Krmpotic
2013-03-06 9:15 ` Jeff King [this message]
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=20130306091515.GC2018@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=david.krmpotic@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).