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
0
votes
0 answers
Getting Cherry-Pick conflicts
while doing cherry-pick of commits from branch development to master there is cherry-pick conflicts caused by missing commits in master (the order of commits matters).
So, I compare the log of commits in the two branches and I cherry-pick the…
aymen0406
- 127
- 10
0
votes
1 answer
Supporting major feature branches in Git when master disallows merge commits
Regulations in my industry require strict linear development - therefore no merge commits in master. We also cannot lose authorship, so extreme squashing of commits is difficult.
We've spent a lot of time exploring options for maintaining features…
David Meehan
- 1
- 1
0
votes
1 answer
Cherrypick all commits from remote branch starting at a tag
I'm working on an old project relying on a game, but the game updated a lot and I need to update my project to the newest version. I've tried simply merging both Repos, but there are so many changes, it's just chaos.
I'd like to cherrypick every…
EKnot
- 151
- 1
- 9
0
votes
2 answers
Mercurial GUI client for OS X with cherry-picking?
This is the one feature that I'm missing from GitX. Is there any such client out there?
What I mean by cherry-picking is the ability to include only certain rows in a commit. Like crecord, but with a nice GUI.
jmagnusson
- 5,799
- 4
- 43
- 38
0
votes
1 answer
git cherry-pick isn't cherry-picking commits
Excuse my bad git but I had a git log like this:
commit fc9ab1fe1cfc2ac1e82e2de18a4244d94a7bb89f
Author:
Date:
message 4
commit 3417248ab0953d715b3318f64635a825473bf73d
Author:
Date:
message 3
commit…
JVM
- 99
- 1
- 5
0
votes
1 answer
How does git cherry-pick compute the patch?
I understand how git cherry-pick works at a high level: It takes the changes introduced in one commit and applies them to another.
However, I’m trying to gain a better understanding of how git actually achieves this under the hood.
Suppose you run…
Pwnosaurus
- 2,058
- 1
- 19
- 21
0
votes
1 answer
Visual Studio - unable to Create cherry Pick from grey commit in the graph
In Visual Studio, I can pull latest from my source branch.
From the history graph, I can see all the commits.
From the "train track" graph, the nodes are colored, most are blue circles, but I have a few that are gray.
If I right-click on an entry…
DrGriff
- 4,394
- 9
- 43
- 92
0
votes
1 answer
Cherry-picking changesets after bulk merge into main
Let's suppose that I have three branches:
Main
+--Dev
+--Release
And several changesets in Dev: changeset 1, 2 and 3 and all three changesets affect some File. At some point I merge them all into Main and get changeset 4, that includes changes from…
Vitaliy Kurokhtin
- 7,205
- 1
- 19
- 18
0
votes
1 answer
Issue while using Cherry-pick api using PRid
I am trying to use the Git-Cherry API, in power shell to automate the process of cherry-picking a PR by its PRid.
$Body = @{
"generatedRefName" = "refs/test";
"ontoRefName" = $BranhcName;
"repository" = $RepoName;
"source" = $PRid #Prid is an…
Tejaswini N
- 11
- 3
0
votes
0 answers
Don't want to bring all features on the staging branch to master
So our team always pushes code to the staging branch for our management to test the website.
And we used to work on a branch like this:
Feature branches -> Develop -> Staging -> Master (production)
The Develop, Staging, and Master are configured…
tonywei
- 677
- 2
- 12
- 25
0
votes
1 answer
Git revision range since last merge, including that merge
Say I have the following situation in Git.
Basically, someone has branches out from master and then merged to their branch (one or more times).
* <- 'master'
| * <- 'topic'
| *
|/|
* |
| * <- 'topic' created
|/
*
Can I use Git revision ranges to…
jgreen81
- 705
- 1
- 6
- 14
0
votes
2 answers
Removing unnamed git branch
Somehow, I've ended up with a project structure as such:
> git log --graph --oneline --all
* a72aed6 (master) feat(data:model:user): modified db service
* 099becd feat(data:model:user): added CRUD for user model
* 59ac87d refactor(): separating…
Nick Bull
- 9,518
- 6
- 36
- 58
0
votes
0 answers
How to see git cherry output in reversed order with size limit?
I need to get the list of commits which have not been cherry-picked yet from other branch for specified time or size. Some of the answers in Stackoverflow suggest to use command like,
git cherry main dev
However, when I run that above command, I…
Sazzad Hissain Khan
- 37,929
- 33
- 189
- 256
0
votes
1 answer
How to cherry-pick a gerrit with all dependencies?
Let's say there is are a few gerrits with dependencies :
A <- B <- C
(C depends on B and B depends on A)
If I simply cherry-pick C, it will not work because the dependencies (A and B) will not be cherry-picked.
How can I easily cherry-pick C such…
Fuad
- 1,419
- 1
- 16
- 31
0
votes
1 answer
Cherry-pick commit with its merge commit without solving conflict
Here is my case:
├── (c0) ── (c1) ── (c2-merge-commit) ── (b0)── (b1-merge-commit)
I wanted to combine c0, c1 and c2 into one commit and have this:
├── (squashed : c0, c1, c2-merge-commit) ── (b0)── (b1-merge-commit)
So i carried my HEAD to c2,…
Kerem atam
- 2,387
- 22
- 34