我有一个偏远的SVN存放处(X),在那里自由开发商正在从事其工作。 然而,在我的公司中,我们与GIT合作,并利用git-svn与GIT和SVN合作。 !!
因此,我把SVN存放处(X)装入GIT当地存放处(A)。 之后,我把当地盖特存放处(A)变成了当地的GIT光存放处(B),以便能够从各地通过SSH从那里提取。
问题在于:每当开发商承诺给他的特别志愿人员国家存放处时,我就“git svn fetch && git svn rebase”,以便更新当地保留(A),但我可以向A.A.的当地光存库(B)提供最新情况。
Any ideas?
我希望我的发言足够清楚。 感谢!
在Gite,合并需要一份工作副本,以便实际完成合并(因为可能发生冲突)。 这可能是因为你可以在你 bare的存放处(B)内合并。
What you can do is merge in your working repository (A), then push the result of the merge to repository (B).
Simple answer - You can push from A to the bare repository B.
You may install SubGit into your repository X, so that a bare Git repository (Y) will be created on that machine, so that syhchroinzation X<->Y will be performed automatically. So you may use Y as a replacement of B or sync them by running "git pull --all " on B periodically. The repository A is redundant in this case.
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. ...
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 ...
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 ...
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 ...
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 ...
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 ...
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 ...
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 ...
