github上传vs项目冲突

来源:互联网 发布:caffe matlab可视化 编辑:程序博客网 时间:2024/05/16 05:38

和小伙伴一起写vs项目,用教育邮箱申请了private hub,结果用客户端一上传就出bug,总是冲突,unable to sync this branch
后来发现是一些临时文件上传了,配置.gitignore就可以成功没有冲突
配置文件如下,这个是配置好之后github自动生成的代码,直接copy进gitignore就可以啦
我们写的是.net酱紫配置的

## Ignore Visual Studio temporary files, build results, and## files generated by popular Visual Studio add-ons.# User-specific files*.suo*.user*.sln.docstates# Build results[Dd]ebug/[Dd]ebugPublic/[Rr]elease/x64/build/bld/[Bb]in/[Oo]bj/# Roslyn cache directories*.ide/# MSTest test Results[Tt]est[Rr]esult*/[Bb]uild[Ll]og.*#NUNIT*.VisualState.xmlTestResult.xml# Build Results of an ATL Project[Dd]ebugPS/[Rr]eleasePS/dlldata.c*_i.c*_p.c*_i.h*.ilk*.meta*.obj*.pch*.pdb*.pgc*.pgd*.rsp*.sbr*.tlb*.tli*.tlh*.tmp*.tmp_proj*.log*.vspscc*.vssscc.builds*.pidb*.svclog*.scc# Chutzpah Test files_Chutzpah*# Visual C++ cache filesipch/*.aps*.ncb*.opensdf*.sdf*.cachefile# Visual Studio profiler*.psess*.vsp*.vspx# TFS 2012 Local Workspace$tf/# Guidance Automation Toolkit*.gpState# ReSharper is a .NET coding add-in_ReSharper*/*.[Rr]e[Ss]harper*.DotSettings.user# JustCode is a .NET coding addin-in.JustCode# TeamCity is a build add-in_TeamCity*# DotCover is a Code Coverage Tool*.dotCover# NCrunch_NCrunch_*.*crunch*.local.xml# MightyMoose*.mm.*AutoTest.NET/# Web workbench (sass).sass-cache/# Installshield output folder[Ee]xpress/# DocProject is a documentation generator add-inDocProject/buildhelp/DocProject/Help/*.HxTDocProject/Help/*.HxCDocProject/Help/*.hhcDocProject/Help/*.hhkDocProject/Help/*.hhpDocProject/Help/Html2DocProject/Help/html# Click-Once directorypublish/# Publish Web Output*.[Pp]ublish.xml*.azurePubxml## TODO: Comment the next line if you want to checkin your## web deploy settings but do note that will include unencrypted## passwords#*.pubxml# NuGet Packages Directorypackages/*## TODO: If the tool you use requires repositories.config## uncomment the next line#!packages/repositories.config# Enable "build/" folder in the NuGet Packages folder since# NuGet packages use it for MSBuild targets.# This line needs to be after the ignore of the build folder# (and the packages folder if the line above has been uncommented)!packages/build/# Windows Azure Build Outputcsx/*.build.csdef# Windows Store app package directoryAppPackages/# Otherssql/*.CacheClientBin/[Ss]tyle[Cc]op.*~$**~*.dbmdl*.dbproj.schemaview*.pfx*.publishsettingsnode_modules/bower_components/# RIA/Silverlight projectsGenerated_Code/# Backup & report files from converting an old project file# to a newer Visual Studio version. Backup files are not needed,# because we have git ;-)_UpgradeReport_Files/Backup*/UpgradeLog*.XMLUpgradeLog*.htm# SQL Server files*.mdf*.ldf# Business Intelligence projects*.rdl.data*.bim.layout*.bim_*.settings# Microsoft FakesFakesAssemblies/# LightSwitch generated filesGeneratedArtifacts/_Pvt_Extensions/ModelManifest.xml
0 0
原创粉丝点击