New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

【最佳实践】多分支并行开发情况下如何merge swagger.json？ #23

Open

gogoyqj opened this issue Jul 23, 2020 · 0 comments

Owner

gogoyqj commented Jul 23, 2020 •

edited

Loading

背景：

在生成 swagger.json 文件时差异太多，不清楚该如何操作。
在合并 master 代码时 swagger.json 文件冲突过多，不知该如何解决。

方法步骤建议：

合并 master 时,直接用 mater 上的 api 文件覆盖本地文件
1-1. git checkout master ./swagger.json ./src/service
1-2. git merge master
对应后端发布分支合并master，生成最新 swagger
sm2tsservice remoteUrl 指向后端发布分支对应的最新 swagger
npm run api

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment