使用git维护webapp的不同版本的工作流程? [英] Workflow for maintaining different versions of a webapp using git?
问题描述
在我的公司,我们现在使用git已经有几个月了(我们对此感到高兴),但是我们仍然无法获得完整100%的git。 p>
我们的主要产品是我们以不同语言提供的网站(前端+管理后端)。这些网站中的一部分提供了其他人不应该提供的功能(例如,需要填写给定表单的字段类型,不同的验证规则集等)。
由于这些差异相当小,我们现在使用配置文件来确定网站是否应使用特定元素。但我想这会导致问题,当网站之间的差异会变大。
我想用不同的分支将使这更容易维护,但你如何维护不同的分支机构有一个共享的核心?我们目前还没有使用像Capistrano这样的部署工具(但正在计划这样做),所以从主人到所有不同分支的无休止的手工樱桃采摘现在不是一种选择。
所以,考虑到这种设置,分支机构如何帮助我们?
master
|
- english
|
- 德语
|
- 法国
<澄清:这不是关于l10n / i18n,而是关于共享核心功能之间的分支)
其他人曾尝试过,并说总是装运箱子
At my company we're using git for a couple of months now (and we're happy about it), but we still don't get git for the full 100%.
Our main product is a website which we offer in different languages (frontend + admin backend). Some of these websites offer features others shouldn't offer (e.g. the type of fields that need to be filled in on a given form, different validation rulesets etc.).
Because these differences are fairly small, we're now using a config file to determine whether or not particular elements should be used by the website. But I guess this will cause problems when the differences between sites will get bigger.
I guess using different branches will make this easier to maintain, but how do you maintain different branches with one shared core? We're not using a deployment tool like Capistrano yet (but are planning to do so), so endless manual cherry-picking from master to all the different branches is not an option at this moment.
So, given this setup, how can branches help us?
master
|
- english
|
- german
|
- french
(For clarification: this is not about l10n/i18n, but about sharing core features between branches)
other people had tried it, and say "always ship trunk"
这篇关于使用git维护webapp的不同版本的工作流程?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!