gitlab - git-flow 与 github-flow 的优缺点是什么？

Question

关闭。这个问题是 opinion-based 。目前不接受答案。

---

想要改进这个问题吗？更新问题，以便 editing this post 可以用事实和引文来回答它。 .

已关闭 3 年前。

Improve this question

我们最近开始使用 GitLab。

目前使用“集中式”工作流程。

我们正在考虑迁移到 github-flow，但我想确定一下。

git-flow的优点和缺点是什么与 github-flow ？

Answer 1

正如 GitMinutes 第 17 集所述，作者 Nicholas Zakas在他关于“GitHub workflows inside of a company”的文章中:

Git-flow is a process for managing changes in Git that was created by Vincent Driessen and accompanied by some Git extensions for managing that flow.
The general idea behind git-flow is to have several separate branches that always exist, each for a different purpose: master, develop, feature, release, and hotfix.
The process of feature or bug development flows from one branch into another before it’s finally released.

Some of the respondents indicated that they use git-flow in general.
Some started out with git-flow and moved away from it.

The primary reason for moving away is that the git-flow process is hard to deal with in a continuous (or near-continuous) deployment model.
The general feeling is that git-flow works well for products in a more traditional release model, where releases are done once every few weeks, but that this process breaks down considerably when you’re releasing once a day or more.

简而言之:

从尽可能简单的模型开始(就像 GitHub Flow 一样)，如果需要，可以转向更复杂的模型。

<小时/>

您可以看到基于 GitHub-Flow 的简单工作流程的有趣插图。在:
“ A simple git branching model ”，主要元素为:

1. master must always be deployable.
2. all changes made through feature branches (pull-request + merge)
3. rebase to avoid/resolve conflicts; merge in to master

<小时/>

要获得真正更完整、更稳健的工作流程，see gitworkflow (one word) .