最近微服务拆分后分支管理搞得我头大，merge冲突多到爆炸...
git checkout feature-user-service
git pull origin main
git merge main
然后就开始疯狂 resolve conflict
登录/注册
