Re: auto merge bug
- From
Jeff King <peff@peff.net>
- Date
- Mar 6, 2013, 09:15 UTC
- Message-ID
- <20130306091515.GC2018@sigill.intra.peff.net>
- In-Reply-To
- <CAOFaZ+4oUD7eMvFmtPdca4AYooxW-PCOiPBUb0jjVw4LPBN8+Q@mail.gmail.com>
On Tue, Mar 05, 2013 at 11:13:12PM +0100, David Krmpotic wrote:
Show 12 quoted lines
> 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