git-cherry-pick

问题 After cherry-picking some commits from one branch to another branch, i still see commits when a pull request is created later. Say for example, There is a git project which has two branches : Dev , Release. And commit history is in following order. DEV : a1, a2, a3, a4, a5, a6 RELEASE : a1, a2 Now if i cherry-picked commits a3 and a5 alone from Dev to Release. Now the commit history will be as shown below. cherry-picked commits will have new SHA (b1 & b2). RELEASE : a1, a2, b1, b2. Later if i

问题 The branch #1 contains a bug fix C1. The branch #2 first cherry-pick ed C1, then the branch #2 owner realised the work done in C1 was wrong actually, so he committed the correct fix C2. In C2 he basically removed the change in C1, replaced with the correct change. When the branch #1 owner wants to "pick-up" the fix, the merge won't work . Because with merge the result C3 will then contain C1 and the correct fix introduced in C2, i.e. C1 will be keep by merge. Because the branch #2 now does

问题 My branch structure is: 0x1---->0x2---->0x3 /\ /\ | | master dev Common ancestors is 0x1. I cherry-pick a feature to master. Scene 1: Master branch have a.txt file. 0x1 first commit. a.txt content: 1 Then I create a branch dev, I add "2" to a.txt, 0x2 second commit 0x1 first commit a.txt content: 1 2 Then I add "3" to a.txt 0x3 third commit 0x2 second commit 0x1 first commit a.txt content: 3 1 2 I cherry-pick 0x3 to master: master> git cherry-pick 0x3 It has no conflict. Scene 2: But I modify

问题 Is there a difference between a : git merge <commit-id> and git cherry-pick <commit-id> ? where ''commit-id'' is hash of the commit from my new branch that I want to get into master branch. 回答1: cherry-pick takes exactly one commit into your current branch. merge takes the entire branch (might be several commits) and merge it to your branch. Same if you merge it with <commit-id> - it doesn't take only the specific commit but the below commits (if there's any) as well. 回答2: There is a huge

问题 Is there a difference between a : git merge <commit-id> and git cherry-pick <commit-id> ? where ''commit-id'' is hash of the commit from my new branch that I want to get into master branch. 回答1: cherry-pick takes exactly one commit into your current branch. merge takes the entire branch (might be several commits) and merge it to your branch. Same if you merge it with <commit-id> - it doesn't take only the specific commit but the below commits (if there's any) as well. 回答2: There is a huge

问题 So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be easy, how ever I get an error about it being a merge but not -m was given? $ git cherry-pick a8c5ad438f6173dc34f6ec45bddcef2ab23285e0 error: Commit a8c5ad438f6173dc34f6ec45bddcef2ab23285e0 is a merge but no -m option was given. fatal: cherry-pick failed That looks wrong.......it should be: $ git cherry-pick

问题 So I have done countless cherry picks before and it seems that I must fail at life with this right now, I am trying to cherry pick from one branch to another which should be easy, how ever I get an error about it being a merge but not -m was given? $ git cherry-pick a8c5ad438f6173dc34f6ec45bddcef2ab23285e0 error: Commit a8c5ad438f6173dc34f6ec45bddcef2ab23285e0 is a merge but no -m option was given. fatal: cherry-pick failed That looks wrong.......it should be: $ git cherry-pick

问题 I have 33 commits in the main branch that are meshed up. Now I need to maintain the record neatly. So now I have created feature branches and I'm trying to classify those 33 commits in different feature branches. So can it be possible to pick multiple commits at a time to copy in the relevant feature branch? And I am also facing its conflicts when I tried multiple commits with the cherry-pick command. git cherry-pick A B C here A, B, C are the commits' hashcode. 回答1: You do it correct. The

问题 We recently switched from SVN to GIT, and I'm having some trouble converting our previous workflow. Mostly everything works, but today I got a weird cherry-pick conflict. I'm able to resolve the conflict, but I would like to know where this came from, because to my understanding there shouldn't be a conflict in this situation. Setup In our repository we have a master branch on which we develop. Four times a year we release a new version. We branch of of master into Release-x and this gets

问题 Updated Consider file abc, identical in both commits A and B begin 123 456 789 klm end In A, we refactor first line 123 => AAA and pick B on top of the result. Git tells that all lines in the file have changed . Its diff will operate normally however, if we modify B by updating any single line. Git will notice that only this one line of text has changed in this case, reporting a single-line conflict if it was the first line also. Here is the code to reproduce mkdir full-shit ; cd full-shit