我开始学习吉特,我坚持 与一个问题。
假设有一个主仓库和两个叉子
师父
- & gt; fork1 - & gt; 我的本地克隆
- & gt; 叉2
I m working on one fork and I can pull changes from 师父 repository and merge them with my own. Now, let s say that some changes are made in one branch in second fork. How can I pull them and merge into my repo?
叉2 - & gt; 与我的本地克隆 - & gt; 推到叉1
另外,我是否可以在第二叉子中将(通过施用散列)从边远分支合并到第二叉子,以及如何合并?
谢谢你的回答
将叉口2 定义为叉口1 中的远程回购
git remote add fork2 /path/to/fork2/repo
然后从叉2 获取更改
git fetch fork2
从叉子2拉动更改。
git pull fork2 <branch name>
提醒您注意, 上面的命令将会更新您当前分支 。 所以您最好使用一个跟踪远程回邮, 并审查更改, 将其合并到您在叉1 中的分支, 如果您同意的话 。
git checkout --track -b branch_fork2 fork2/branch2
审查您本地分支中名为分支_fork2 的代码。
检查您想要合并叉子2 更改的位置的回邮 。
git checkout feature_1
那就合并起来吧
git merge branch_fork2
如果它导致合并冲突,解决合并冲突并造成冲突。
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 ...