首先,请允许我介绍项目的一般结构。
它是等级的。 我们为客户开发服务器应用程序。 储存在<>主要服务器。
Say, Local Service 1, local services 2, ..., local services n are theuser (main application cases). 每个公司都有一个当地服务器。 大部分地方服务器都有同样的功能(例如,核心模块),但每个公司都有自己的。 作为一项想法,决定通过git Branching解决这一问题。
请允许我审议一些案件。
Case 1
One company (local server x) wants some specific feature that is needed only in that company. Following the logic our of idea of branches we do the following steps:
- create git branch on main server
- develop needed functionality for that server
- create git branch (branch y) on local server x
- push changes to main server
- switch branch y on local server x
- switch to master branch on main server
Case 2
We developed some functionality (changes in core module) that is common to all companies
Case 3
We developed some functionality that is common only to some companies
• 听取您关于如何处理“Case 2和“Case 3”的建议。