git-merge

问题 So I added a folder to my .gitignore file. Once I do a git status it tells me # On branch latest nothing to commit (working directory clean) However, when I try to change branches I get the following: My-MacBook-Pro:webapp marcamillion$ git checkout develop error: The following untracked working tree files would be overwritten by checkout: public/system/images/9/thumb/red-stripe.jpg public/system/images/9/original/red-stripe.jpg public/system/images/8/thumb/red-stripe-red.jpg public/system

问题 I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that the other version of the file is good and that mine is bad so all my changes should be abandoned. How can I do this? 回答1: Since your pull was unsuccessful then HEAD (not HEAD^ ) is the last "valid" commit on your branch: git reset --hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the "theirs"

问题 I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that the other version of the file is good and that mine is bad so all my changes should be abandoned. How can I do this? 回答1: Since your pull was unsuccessful then HEAD (not HEAD^ ) is the last "valid" commit on your branch: git reset --hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the "theirs"

问题 What's the difference between git merge and git rebase ? 回答1: Suppose originally there were 3 commits, A , B , C : Then developer Dan created commit D , and developer Ed created commit E : Obviously, this conflict should be resolved somehow. For this, there are 2 ways: MERGE : Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E . However, this creates diamond shape, which many people find very confusing. REBASE : We create commit R , which

问题 I've been using Git now for a couple of months on a project with one other developer. I have several years of experience with SVN, so I guess I bring a lot of baggage to the relationship. I have heard that Git is excellent for branching and merging, and so far, I just don't see it. Sure, branching is dead simple, but when I try to merge, everything goes all to hell. Now, I'm used to that from SVN, but it seems to me that I just traded one sub-par versioning system for another. My partner

问题 I've been using Git now for a couple of months on a project with one other developer. I have several years of experience with SVN, so I guess I bring a lot of baggage to the relationship. I have heard that Git is excellent for branching and merging, and so far, I just don't see it. Sure, branching is dead simple, but when I try to merge, everything goes all to hell. Now, I'm used to that from SVN, but it seems to me that I just traded one sub-par versioning system for another. My partner

问题 I've been using Git now for a couple of months on a project with one other developer. I have several years of experience with SVN, so I guess I bring a lot of baggage to the relationship. I have heard that Git is excellent for branching and merging, and so far, I just don't see it. Sure, branching is dead simple, but when I try to merge, everything goes all to hell. Now, I'm used to that from SVN, but it seems to me that I just traded one sub-par versioning system for another. My partner

问题 I've run into this situation about 3 or 4 times now. On occasion, Git will want to perform a merge. It happens in response to a git commit <filename> -m <message> followed by a git push . I know a merge is about to occur because Git spins up the editor for the message. So I perform a CTRL + C in an attempt to stop it. I don't really care why or what got me into the state. When things have to be merged, I just want to stop. I do not want it to occur because it pollutes the check-ins, pollutes

问题 What I am trying to do is ensure that I can delete local branches safely. I found some great answers to this question here: How can I know in git if a branch has been already merged into master? So we have the source branch and the destination branch. The source branch is the one that may or may not be completely merged into the destination branch already. The problem with the answers in the above link, is that the answers don't seem to work if the destination branch has new commits after

问题 This is not a question on git merge origin branch vs git merge origin/branch git merge <branch> merges the into the working branch. And so we need to specify the "source" of the branch. It can be a locally available origin/<branch> or the local working branch heads/branch . But what's the need for origin ? Unlike git pull we don't need to specify which remote source to fetch the from. A merge operation, to my understanding, is a local operation. 回答1: The git pull command lets you specify a