合并2个相同的存储库GIT [英] Merge 2 same repository GIT
问题描述
在stackoverflow上的专家。
我是git的新手,开发小团队的C#项目。假设项目需要来自自由职业者的贡献,我通过创建DLL来锁定我的代码的重要部分,并使用DLL为该项目创建一个新的GIT仓库供自由职业者使用。我想知道的是,如果我们编辑同一个文件,如何将自由职业者回购与我的回购合并?是否可以在git上使用submodule?
在此先感谢。
<我会使用一个子模块来容纳一个混淆的DLL供他使用。所有你需要做的就是让他把自己的分支推到外面的仓库,并且像这样协调。
experts on stackoverflow..
I'm new on git, develop C# project with small team. assuming the project need contribution from freelancer, i lock important part of my code by create the DLL, and create a new GIT repo for that project with DLL for freelancer to work on it. what i want to know is, how to merge the freelancer repo with my repo if we edited the same file? is it OK using submodule on git?
thanks in advance.
I would use a submodule to house an obfuscated DLL for him to use. All you have to do is allow him to push his own branch to the outer repo and coordinate like that.
这篇关于合并2个相同的存储库GIT的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!