Git的理念：如何获得＆QUOT;主＆QUOT;分公司＆QUOT;生产＆QUOT;科？ [英] Git philosophy: how to get "master" branch to "production" branch?

问题描述

pretty确保我误解饭桶。

Pretty sure I'm misunderstanding git.

• 我有一个主分支在github私人回购。


• 我想也有一个分公司生产，我会推我的所有变化由主到。


• 然后，我会想将它连接到Azure和Azure的诉说自动从生产分公司部署。

我最好如何做到这一点？起初，我想这是与混帐推，但我相信这是对远程仓库，所以我现在想知道最好的做法是主分支合并为生产分支的东西。

How do I best accomplish this? Initially I was thinking it was with "git push", but I believe that's for remote repositories, and so I'm now wondering what the best practice is to merge the "master" branch to the "production" branch.

或者，我在想这件事了？

Or, am I thinking about the whole thing wrong?

感谢 - 期待着把我的Subversion天在我后面

Thanks -- looking forward to putting my Subversion days behind me.

推荐答案

^{（因为我想分享一个致富信息）...）}

你在看什么，谈主和制作分支时，是一个合并流程。

What you are looking at, when talking about master and production branches, is a merge workflow.

您可以定义你需要你想要的任何版本控制系统工具的工作流程，并在开发生命周期管理来看，最完整的合并工作流程组的人在这个TFS（团队基础服务器）集的描述，详细在其 TFS Brancing指南在这个问题说明的服务处标准科计划。结果
言归正传Git里， 混帐流程 是另一个合并的工作流程相当受欢迎。

You can define the workflow you need with any Version Control System tool you want, and in term of development lifecycle management, one of the most complete set of merge workflow set is described in this TFS (Team Foundation Server) set, detailed in its TFS Brancing Guide and illustrated in this question "Servicing Branch in Standard Branch Plan".
Closer to git, git flow is another merging workflow quite popular.

但是，你正在使用DVCS，它的分布式的方面引入了另一个（正交）工作流程：一个的发布的一个（混帐推-u原产地督促）。请参阅源控制 - 分布式系统与分布式非 - ？有什么区别

But you are using a DVCS, and its distributed aspect introduces another (orthogonal) workflow: a publication one (your git push -u origin prod). See "Source Control - Distributed Systems vs. Non Distributed - What's the difference?"

公开，发布管理的一部分，是从合并，发展的一部分相当不同。结果，
通过合并主到刺，你冻结了什么发展已经巩固，并将其标记为被释放。< BR>
通过将其推到GitHub上，您启动释放过程。

Publication, part of release management, is quite different from merge, part of development.
By merging master to prod, you freeze what has been consolidating in development, and mark it as to be released.
By pushing it to GitHub, you start that release process.

这篇关于Git的理念：如何获得＆QUOT;主＆QUOT;分公司＆QUOT;生产＆QUOT;科？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！