git-merge

问题 Having no remote repository, just one local repository with two branches. $ git branch -a master * devel Are following commands in this context the same/synonym? $ git pull . master and $ git merge master UPDATE: $ git help pull gives following information SYNOPSIS git pull <options> <repository> <refspec>... DESCRIPTION ... Note that you can use . (current directory) as the <repository> to pull from the local repository — this is useful when merging local branches into the current branch. I

问题 Can any body explain the difference between git merge origin master and git merge origin/master ? I did accidentally did git merge origin master . If it is different, what is the command to reset that merge? 回答1: After my test, $git merge origin master equals $git merge origin/HEAD master . This means merge two branch (origin/HEAD, master) into current branch, which is very different from $git merge origin/master . But as usually, master branch and origin/HEAD is in the same commit line, so

问题 I've just found git-subtree tool that some time ago became a part of main git repo https://github.com/apenwarr/git-subtree/ However I don't fully understand what functionality does this tool provide over the already existing "git read-tree" + "git merge -s subtree". Is the only purpouse of git-subtree - making the resultant commit history look better or does it have more functionality that I've overlooked? 回答1: The commands you describe reads a subtree into a repository. The git-subtree

问题 I have two unrelated (not sharing any ancestor check in) Git repositories, one is a super repository which consists a number of smaller projects (Lets call it repository A). Another one is just a makeshift local Git repository for a smaller project (lets call it repository B). Graphically, it would look like this A0-B0-C0-D0-E0-F0-G0-HEAD (repo A) A0-B0-C0-D0-E0-F0-G0-HEAD (remote/master bare repo pulled & pushed from repo A) A1-B1-C1-D1-E1-HEAD (repo B) Ideally, I would really like to merge

问题 I have two unrelated (not sharing any ancestor check in) Git repositories, one is a super repository which consists a number of smaller projects (Lets call it repository A). Another one is just a makeshift local Git repository for a smaller project (lets call it repository B). Graphically, it would look like this A0-B0-C0-D0-E0-F0-G0-HEAD (repo A) A0-B0-C0-D0-E0-F0-G0-HEAD (remote/master bare repo pulled & pushed from repo A) A1-B1-C1-D1-E1-HEAD (repo B) Ideally, I would really like to merge

问题 To give you a background the way I monitor Git repository and branches; I have been monitoring two branches starting from each sprint - release and master. Master branch is from where developers create new branch(task specific), implement their changes, and creates pull request which gets merged into the Master . Release branch is sprint specific which remains always submittable to the production. We only merge branches committed to the Master and verified by the QA into Release branch. Makes

问题 2 years ago I had forked a git repository. After that we made some changes on our side not much but we have changed little things in many files. Now there are some fixes+features in base git repo from which we had forked. Since now we want to include those changes to our forked one, by keeping our local changes constant. Is there any way to merge latest repo changes to our forked repo keeping our local changes as it is? 回答1: If the changes are isolated onto their own branch, then you can

问题 I have three versions of the file: version 1 common ancestor version 2 ------------- --------------- ------------- before original line original line original line after What happens while comparing these versions to produce final merge version ? I have read some information about this topic, but I am still confused how exactly it works. As for latter example: Is comparing individual lines between versions linear ? If so, then final merge should look like this: 1 line: before 2 line: conflict

问题 I have checked out gh-pages branch. I try git merge master and I receive the following "error: The following untracked working tree files would be overwritten by merge: ... Please move or remove them before you can merge." That's exactly what I want to do. I want the files on the master branch to override the versions of those same files on the gh-pages branch. I have read up a little on versions of the git rm... command and also tried git stash and git reset head . I still get the same error

问题 Is it possible to undo the git abort. Scenario is that I was merging two branches when run command git merge its shows an error message you have uncommitted changes, therefor I run git commit now message appears "fatal error there is a merge conflict between, abort the operations to resolve the issue", so I run the command git merge --abort . After this i lost my local code changes too. Is there any solution to undo abort or get my local code back. 回答1: No, unfortunately if you didn't commit