Question

The Problem

I have a Rails 3.1 app on Heroku which will soon require a bunch of (3rd party) submodules (some of which have submodules). Unfortunately, Heroku lacks submodule support. One suggestion on Heroku s website is to move the contents of the submodules into the main repo (here). This will work fine the first time, but there is a possibility that it won t the second. This could be caused by a major update in one of the third party submodules where a fast forward merge is unsuccessful. Obviously we can t manually merge a third party project.

The "Solution"

我们的暂定解决办法如下:

Create a new temp branch based on the latest stable dev branch and merge the submodules into the project.
Checkout to a heroku branch.
Nuke the contents of this heroku branch to avoid any possible conflicts, i.e. create a commit with everything deleted.
Merge the temp branch into the heroku branch.
Push this heroku branch to our Heroku server.

The Advantages

这将避免第三方分流中可能出现的任何冲突,并且可以描述。

The Disadvantages

这种做法极为不利,是特别志愿人员的最高抵抗者。

The Question

是否有更好的办法这样做?

Answer 1

Heroku现在支持分流。

http://devcenter.heroku.com/articles/git-submodules

然而,这一特点并不支持私人的子宫。

Answer 2

另一种替代办法是:

Go to /a>,并可以<代码>repo<>/code>范围为凭。

现在可以做git lin https://时间：2016-12-21 14:28:06


       
   	
Since Heroku doesn t currently support submodules, one other possible way would be to use sub-tree merging.

基本上来说,子树mer合并是一种吉祥的合并战略,使你能够把另一个宝库合并到你身上,但放在你选择的子里。 有一个名为“git-subberry/code>,该工具试图以类似于git-submodule(1)的方式对这一过程进行总结。


除git-joint(1) man page外,还有其他一些条款可帮助您执行这一合并战略:


github:help on subtree merging
Pro Git Chapter 6, Section 7: Subtree Merging
I ve also written a post called "Subtree merging and you"

    

       

            
                
                    时间：2011-11-21 11:29:21
                
                
            
   
   
       
   	
你可以简单地增加公共支部,她的oku将在你部署时为你们 for。

Heroku 解释了

$ git submodule add https://username:[email protected]/myusername/FooBar


不幸的是,当你这样做时,就把你的用户名和密码放在简单文本中。
    
       
            
                
                    时间：2013-01-17 13:34:15
                
                
            
   
   
       

   
   

  
  	上一篇：通过POST认证到ASP网站,并检索到html网页
  	下一篇：无法连接到服务器数据库系统的启动包的无效长度已被关闭, 收到快速关闭请求( pgadmin postgres docker)
  
   

   
   

  
    
   	相关问题
   	
     	
    
    
            
                
    				git confusion - cloning a repo is returning a past version                
                
                
                Im having some confusion with my git usage. 
I cloned a repo from one comp to the other, and the new clone is the state of the original that was active some time ago. So its cloning a past version. 
...
                            
            
            
                
                    时间：2009-11-15 19:23:37
                
                
                    
                    回答：3
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				Appropriate strategy for tagging and hotfixing with git                
                
                
                I was wondering if the strategy I m using for tagging and hotfixing tags (which then I use for deploying rails applications) with git is appropriate.

For tagging I just tag a commit of the master ...
                            
            
            
                
                    时间：2009-11-15 13:19:45
                
                
                    
                    回答：2
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				Migrating a svn repo to git. Multiple app in svn repo need to broken into separate git repos                
                
                
                I have a svn repo with various apps as subdirectory of a single svn repo. That worked because I could have checked out a partial, repo. As I cant do that with git obviously I need multiple  repos. I ...
                            
            
            
                
                    时间：2009-11-14 17:44:15
                
                
                    
                    回答：1
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				git: merge a portion of one branch s source tree into another, regardless of individual commits                
                
                
                I understand how to merge branches together in git, and I love how easy it makes it.

I have a branch that looks like this:

project/
|--subproj1/
|  |---(files)
|
|--subproj2/
   |---(files)
A ...
                            
            
            
                
                    时间：2009-11-14 02:20:50
                
                
                    
                    回答：1
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				Tips on upgrading CVS to git/hg?                
                
                
                We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc.

It s just everyone is so ...
                            
            
            
                
                    时间：2009-11-11 09:31:48
                
                
                    
                    回答：4
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				Unable to determine upstream SVN information from HEAD history                
                
                
                I get this on every git svn command I try. I am using git version 1.6.4.2 on OS 10.6

The initial git svn fetch works, and i can do further fetches after that, but they do not enter the log or update ...
                            
            
            
                
                    时间：2009-11-10 18:08:18
                
                
                    
                    回答：1
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				How to switch branches with git and get ignored files removed?                
                
                
                Given I have a master branch and a other branch. In the other branch are files I don t want to commit (e.g. log files) so I ignored them in .gitignore. 

When I switch to the master branch, these ...
                            
            
            
                
                    时间：2009-11-07 08:43:21
                
                
                    
                    回答：2
                
                
                    
                    展示：1
                
            
        
    
      	
    
    
            
                
    				Using Git in a TFS shop                
                
                
                Using Git at home has spoiled me - I now find using TFS at work to be a bit of a drag and want to explore the possibility of using Git locally and syncing somehow with TFS. I figure there are a few ...
                            
            
            
                
                    时间：2009-11-06 14:15:57
                
                
                    
                    回答：4
                
                
                    
                    展示：1

Answer 3

Since Heroku doesn t currently support submodules, one other possible way would be to use sub-tree merging.

基本上来说,子树mer合并是一种吉祥的合并战略,使你能够把另一个宝库合并到你身上,但放在你选择的子里。有一个名为“git-subberry/code>,该工具试图以类似于git-submodule(1)的方式对这一过程进行总结。



除git-joint(1) man page外,还有其他一些条款可帮助您执行这一合并战略:


github:help on subtree merging
Pro Git Chapter 6, Section 7: Subtree Merging
I ve also written a post called "Subtree merging and you"

Answer 4

你可以简单地增加公共支部,她的oku将在你部署时为你们 for。

Heroku 解释了

$ git submodule add https://username:[email protected]/myusername/FooBar

不幸的是,当你这样做时,就把你的用户名和密码放在简单文本中。

The Problem

The "Solution"

The Advantages

The Disadvantages

The Question

友情链接