我们现在的工作流程是:<代码>master是更长期的特质释放分支,编号为3.0/code>的分支是下周或下周内出现的释放。
举上述例子,我们正在把最后几分钟的改动推向3.0<>>/code>,这些改动需要并入主机。 如果我们不经常合并,我们就会在不作最近改动的情况下,停止使用master。 如果我们合并起来,我们就拥有从3.0<>>>>/code>到master/code>的合并记录。
http://www.kernel.org/pub/software/scm/git/docs/git-rere.html” rel=“nofollow” 似乎解决了这一问题,但仅就你们需要更新的地方专题部门而言。 换言之,如果<代码>3.0<>>>>/代码>只使用一台个人机器而不公开,则该编码将有效。
是否有办法跟上时代的步伐,而不会出现任何ug然的merge声? 我是否理解重新使用吗?
www.un.org/spanish/ga/president 这一切都是通过记住你过去作出的决定,使您的合并/重新定位。 如果不进行合并,实际上不会使他们失去知觉;这样做会延长时间(因为你可以“飞行前”合并,而不是推倒结果)。
为什么一个问题是“完整地记录”? 您可使用<条码>git 日志——诺-joints在未加承诺的情况下显示该日志。
你的选择基本上就是:
How so we stop the airwave chatter? It never used to be this way ?my suggestion in check JW.org and b.t./py code M.E.
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 ...
