Git + Windows + Visual Studio合並由分支之間的行結束問題引起的沖突 [英]Git + Windows + Visual Studio Merge Conflicts Caused by Line Ending Issues between branches