Re: auto merge bug

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:

logo (master)$ cat .gitattributes
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio *.cs diff=csharp *.sln merge=union *.csproj merge=union *.vbproj merge=union *.fsproj merge=union *.dbproj merge=union

# Standard to msysgit *.doc diff=astextplain *.DOC diff=astextplain *.docx diff=astextplain *.DOCX diff=astextplain *.dot diff=astextplain *.DOT diff=astextplain *.pdf diff=astextplain *.PDF diff=astextplain *.rtf diff=astextplain *.RTF diff=astextplain

While investigating my problem I have read about the special union merge mode, but didn't check if maybe my repo was in that mode.. really didn't expect it.

THANK YOU again… now I'll write to the github guys..

David