C#/.NET 微服务架构：从入门到精通（三）：使用 Git 管理项目代码

前两篇我们完成了微服务架构核心理论梳理、开发环境搭建与首个.NET 微服务项目创建。而在微服务多人协作、多服务并行开发的场景下，代码管理是整个研发流程的基石。Git 作为目前最主流的分布式版本控制工具，是.NET 微服务开发必备技能。

本篇作为系列第三篇，将聚焦Git 在.NET 微服务项目中的实战应用，从基础初始化、分支管理、协作开发到最佳实践，手把手教你用 Git 规范化管理.NET 微服务代码。

一、为什么微服务项目必须用 Git？

传统单体应用代码量小、协作简单，而微服务架构有多个独立服务、多团队并行开发、频繁迭代部署的特点：

• 多服务隔离：订单服务、用户服务、网关服务等独立开发，需要版本隔离与追踪；
• 多人协作：不同开发者负责不同服务，避免代码冲突、覆盖；
• 版本回滚：微服务上线后 bug 快速回滚，依赖 Git 版本管理；
• 持续集成 / 部署（CI/CD）：Git 是 DevOps、自动化部署的核心入口；
• 分支策略：支持开发、测试、发布多环境代码隔离。

Git 的分布式特性、分支轻量化、协作友好性，完美适配.NET 微服务的开发模式。

二、Git 基础环境准备

1、Git安装

Windows/macOS/Linux 均可直接官网下载：https://git-scm.com/install/

安装时默认选项即可，安装完成后打开终端 / CMD，验证安装：

git --version

出现版本号即安装成功

 2、Git 全局配置（首次必做）

配置用户名和邮箱（与代码提交身份绑定）：

# 配置用户名（建议用GitHub/Gitee昵称）
git config --global user.name "你的名字"
# 配置邮箱（建议用代码托管平台邮箱）
git config --global user.email "你的邮箱"
# 查看配置
git config --list

三、.NET 微服务项目 Git 初始化实战

我们以上一篇中创建的项目演示 Git 初始化全流程。

 1、在Gitee中创建代码仓库

 2、将项目代码上传到刚创建的代码仓库中

配置.gitignore 忽略规则，上传时需要忽略.git、.vs文件夹等所有需要忽略的 VS/.NET 相关文件

.gitignore文件：

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from `dotnet new gitignore`

# dotenv files
.env

# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Mono auto generated files
mono_crash.*

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# Visual Studio 2017 auto generated files
Generated\ Files/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# Benchmark Results
BenchmarkDotNet.Artifacts/

# .NET
project.lock.json
project.fragment.lock.json
artifacts/

# Tye
.tye/

# ASP.NET Scaffolding
ScaffoldingReadMe.txt

# StyleCop
StyleCopReport.xml

# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# Visual Studio Trace Files
*.e2e

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json

# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs

# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_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*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak

# SQL Server files
*.mdf
*.ldf
*.ndf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp

# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp

# Visual Studio 6 technical files
*.ncb
*.aps

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# CodeRush personal settings
.cr/personal

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config

# Tabs Studio
*.tss

# Telerik's JustMock configuration file
*.jmconfig

# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs

# OpenCover UI analysis results
OpenCover/

# Azure Stream Analytics local run output
ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog

# NVidia Nsight GPU debugger configuration file
*.nvuser

# MFractors (Xamarin productivity tool) working folder
.mfractor/

# Local History for Visual Studio
.localhistory/

# Visual Studio History (VSHistory) files
.vshistory/

# BeatPulse healthcheck temp database
healthchecksdb

# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd

# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
*.sln.iml
.idea

##
## Visual studio for Mac
##


# globs
Makefile.in
*.userprefs
*.usertasks
config.make
config.status
aclocal.m4
install-sh
autom4te.cache/
*.tar.gz
tarballs/
test-results/

# Mac bundle stuff
*.dmg
*.app

# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# Vim temporary swap files
*.swp

1. 初始化git
   

   

    输入Git初始化命令

   git init

   

2. 将本地项目工作区的所有文件添加到暂存区
   

   # 小数点 “.” ，意为添加文件夹下的所有文件；也可以将 “.” 换成具体的文件名，如果想添加项目中的指定文件，那就把 “.” 改为指定文件名即可。
   git add .

   
   可以看到.vs .git不会被包括在里面

   

3. 将暂存区的文件提交到本地仓库
   

   # 注释的作用是告诉下载和浏览的用户你这次提交代码所改变的地方
   git commit -m "注释说明"

   

4. 将本地代码仓库关联到Gitee上
   

   git remote add origin 仓库地址

   

5. 将代码由本地仓库上传到Gitee远程仓库
   

   git push -u origin master

   

6. 查看代码仓库，已上传
   

   

7. 为代码仓库添加README.md文件与开源许可
   

   

   

    开源许可选择MIT

   

    然后本地再拉取一下代码仓库

   

三、NET 微服务 Git 协作核心操作

1. 同步远程代码（避免冲突）

开发前必拉取最新代码：

git pull origin master

2. 解决代码冲突（微服务高频场景）

多人修改同一文件会产生冲突，.NET 项目中服务接口、共享库最易冲突：

1. 冲突文件会标记<<<<<<</=======/>>>>>>>；
2. 手动修改代码，保留正确逻辑；
3. 重新提交：
   

   git add .
   git commit -m "fix: 解决订单服务接口冲突"

    

3. 版本回滚（微服务救急）

回滚到历史稳定版本：

# 查看提交历史
git log --oneline
# 回滚到指定版本（soft：保留代码，hard：删除代码）
git reset --soft 提交哈希值

四、.NET 微服务 Git 管理最佳实践

1. 提交信息规范（强制推荐）

统一提交备注，方便微服务版本追踪，使用Angular 提交规范：

<type>(<scope>): <subject>

• type：类型（feat: 新功能、fix: 修复、refactor: 重构、docs: 文档）
• scope：作用域（微服务名，如 user、order、gateway）
• subject：描述

示例：

git commit -m "feat(user): 用户服务新增登录接口"
git commit -m "fix(order): 修复订单创建超时bug"
git commit -m "refactor(gateway): 优化网关路由配置"

2. 微服务代码管理两种模式

1. 单仓库多服务（Monorepo）：所有微服务放在一个 Git 仓库（小型项目，便于统一管理）；
2. 多仓库单服务（Multirepo）：每个微服务独立仓库（大型项目，服务隔离）。

.NET 微服务推荐：中小型项目用 Monorepo，大型分布式项目用 Multirepo

五、总结

本篇我们完成了Git 在.NET 微服务项目中的全流程实战：

1. 搭建 Git 环境，初始化.NET 微服务仓库，配置专属.gitignore；
2. 掌握企业级 Git Flow 分支策略，适配微服务协作开发；
3. 实现远程仓库托管、团队协作、冲突解决；
4. 落地.NET 微服务 Git 管理最佳实践与规范。

代码管理是微服务开发的基础，规范化的 Git 使用能大幅提升团队协作效率，为后续 CI/CD、容器化部署打下坚实基础。