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

Jump to bottom

关于Gitflow工作流中，维护分支和开发分支合并的疑问 #82

Open

ghost opened this issue Jan 7, 2021 · 0 comments

ghost commented Jan 7, 2021 •

edited by ghost

你好，Gitflow工作流下，维护分支与本地开发分支合并时，本地开发分支是否应该先与服务器端的开发分支同步下呢？

目前文档是直接切换到本地开发分支，然后合并并提交。如果在合并前，本地开发分支与远程开发分支同步一下，是否比直接合并和提交能避免冲突，或者是说提前把冲突解决了？

ghost changed the title ~~关于维护分支和开发分支合并的疑问~~ 关于Gitflow工作流中，维护分支和开发分支合并的疑问

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