In source control management, the act of selectively pulling single changes from peer to peer is called "cherry-pick".
Questions tagged [cherry-pick]
448 questions
1
vote
1 answer
Git cherry-pick failed to pick the right changes
Note: It was a mistake from my side. I cherry-picked the parent hash. Please see the update section.
Original Question:
I have a file vmu_hw_test in a branch "test_imu" which has a change similar to seen below
if( g_imu_spi.readFromFifo() == 0)
{
…
clamentjohn
- 3,417
- 2
- 18
- 42
1
vote
2 answers
GIT cherry pick all my commits that exists in one branch to another branch
I have 2 branches A and B. Branch B was branched from branch A at some time and multiple users are committing to both branches. I want to cherry pick all my commits (that doesn't already exist in branch A) from branch B to branch A without the need…
user3414980
- 29
- 1
- 9
1
vote
1 answer
Merge specific change in a commit from another branch
I want to merge a change in a commit of development branch to another branch using git. I tried git cherry-pick but it results change in the whole file, not the specific change. Can anyone help with that?
Ravinda Lakshan
- 1,006
- 14
- 14
1
vote
0 answers
git cherry master upstream vs upstream master
I am a bit confused as to what the logical difference here is between git cherry master upstream and git cherry upstream master. I get that it former is probably the more correct one to apply, but I don't exactly get why the list is much longer the…
Muhwu
- 1,151
- 1
- 10
- 26
1
vote
1 answer
Git how to make an empty commit with two parents
I’ve some issues finding the right git command for the job.
A place I work at is currently switching source control (TFVC -> Git). However, the old version in TFVC still needs bug fixing from time to time.
I’ve handled that by creating a build…
HitzSPB
- 158
- 10
1
vote
1 answer
How to properly use Git cherry-pick
I know that we use cherry-pick to get the content from a specific commit into our current branch.
I'll explain a situation and need some help to fully understand cherry-pick and be sure this is the right way to solve my problem.
Imagine we have two…
PlayHardGoPro
- 2,791
- 10
- 51
- 90
1
vote
1 answer
Git auto merge commits from another repo
I have 2 private repository (not branches) A and B of which I have full access to.
Whenever A makes a commit, I want B to cherry-pick or merge the new commit into it (assuming no merge conflicts), so that B will always be up-to-date with the latest…
Avery235
- 4,756
- 12
- 49
- 83
1
vote
1 answer
How do I include my first commit in my cherry pick command?
Cliffnotes version
Assume I want to run this command: git cherry-pick ABC..XYZ. I want ABC to be included in my commits to the current branch. Do I have to reference the commit before ABC?
Long Version
So I have branches master, Apple and…
munchschair
- 1,593
- 3
- 19
- 43
1
vote
1 answer
Git cherry picking a range
I have two branches that are very different from each other, however one branch contains some useful code that I would like to add to the other branch. The branches diverged so long ago that i cannot merge them as many of their features are…
Stuart Buckingham
- 1,574
- 16
- 25
1
vote
1 answer
Cherry pick an australian address from a page of text
I am trying to parse a prose paragraph for anything that might resemble an address. I have a database of addresses I am matching against and these are the only addresses I am interested in. I'm using a lamp server but technology specific answers…
Jason
- 15,064
- 15
- 65
- 105
1
vote
1 answer
git-log with an "OR" clause - or - how to merge git-log outputs?
I'm currently trying to cherry-pick a feature from the trunk of an OSS project into a fork. Both repositories use git and I have the trunk imported into the fork as a branch so it should make things nice and easy.
The approach I'm taking is to…
jkp
- 78,960
- 28
- 103
- 104
1
vote
1 answer
Git reverts and cherry picks
I'm puzzled by something, here's a summary.
Our repo has a master branch and a d2l_phase_4 branch. Since the d2l_phase_4 branch was created several new commits have been added to master.
Today someone incorrectly merged a pull request into master of…
Hugh
- 748
- 9
- 9
1
vote
1 answer
"git cherry-pick" adds "Conflicts:" line to commit message
Whenever I use git cherry-pick and there are conflicts, after resolving the conflicts and running git cherry-pick --continue, the commit message has an added Conflicts: section, like so:
Conflicts:
HighCommander4
- 50,428
- 24
- 122
- 194
1
vote
2 answers
How do I file one Pull Request per Commit after making multiple Commits?
I've been working on a project and made good progress on several tasks.
I have been careful enough to keep all my changes for each task on their own individual commits.
Now, I want to issue pull requests for each commit individually, so there is…
Matt Sephton
- 3,711
- 4
- 35
- 46
1
vote
0 answers
GIT Cherry-picking one commit X times
I'm facing a strange behaviour with some commits on my SVN migrated GIT repository:
I tried to cherry-pick onto a release branch a commit from the master that had been previously already merged onto the release branch with SVN.
GIT did not detect…
Yann Delanoe
- 164
- 8