简体繁体 English

监控版本控制的最佳方法 - ROR

[英]best way to monitor versioning - ROR

原文 2012-04-30 18:57:25 9 2 ruby-on-rails/ git

I currently have an app that is live. 我目前有一个现场应用程序。 I want to add a bunch of new functionality to it, but don't want to upload it via heroku until it is completely finished. 我想为它添加一些新功能，但不想通过heroku上传它，直到它完全完成。 The new functionality stuff is quite extensive so it will be done via multiple git branches. 新的功能是相当广泛的，所以它将通过多个git分支完成。

My question is, how do I continue to build out the app while keeping the existing one running and being able to fix minor things here and there on the live site without having the WIP stuff shown? 我的问题是，如何在保持现有应用程序运行的同时继续构建应用程序，并且能够在实时站点上此处和那里修复小问题而不显示WIP内容？

Thanks. 谢谢。

2 个解决方案

Check out 查看

http://nvie.com/posts/a-successful-git-branching-model/ http://nvie.com/posts/a-successful-git-branching-model/

Your issue is resolved by the hot fixes branch. 您的问题由hot fixes分支解决。 "Merge"/copy production to the hot fix branch. “合并”/复制生产到热修复分支。 Test the change. 测试变化。 When the testing passes, merge the change into production and merge the change into development. 测试通过时，将更改合并到生产中并将更改合并到开发中。

You should deploy another copy of your application that will be your testing/staging environment. 您应该部署应用程序的另一个副本，该副本将是您的测试/暂存环境。 Deploy to it while you develop. 在开发过程中部署到它。 After you're done developing, merge everything to master and deploy to the production env. 完成开发后，将所有内容合并到主控并部署到生产环境。

Also, read the link that @MarlinPierce posted. 另外，阅读@MarlinPierce发布的链接。 It changed my life :) 它改变了我的生活:)