Stack Overflow
Stack Overflow

Questions tagged [cherry-pick]

In source control management, the act of selectively pulling single changes from peer to peer is called "cherry-pick".

448 questions
1
vote
0 answers

git: cherry-pick fails to fix branch from master using Gerrit Code Review

It turns out that another developer had avoided merging some changes until they could be vetted on master, so it was good that it got flagged. However, I manually applied my changes. I believe that I made a mistake here by not using merge, but…
crusty-dave
  • 41
  • 5
1
vote
1 answer

Will git log --cherry-pick --right-only --no-merges ignore all commits correctly cherry-picked between branches?

I work in a large software team doing large monthly releases. We work on a branch to release model (see diagram). This model solves a lot of problems, but has some risks to manage. When I go to release branch 1.1 to production, I need to check…
hawkeye
  • 34,745
  • 30
  • 150
  • 304
1
vote
3 answers

Replace whole state of application with state of another commit

I'd like to do "the hardest version" of cherry-pick/merge/rebase/checkout, what means that state of app on my branch begins to look exactly like in the cherry-picked commit (but with keeping history of my branch). In fact I could duplicate my repo,…
Karol Selak
  • 4,248
  • 6
  • 35
  • 65
1
vote
1 answer

Isolate git changes from one branch to another by specific commit

I've been looking around for a while and different options trying to find an answer but am struggling with how I can accomplish this function. We have a high volume of changes and sometimes certain changes don't get approved in cycles while others…
CV-Dev123
  • 21
  • 3
1
vote
1 answer

git cherry-pick: manually accept "our" or "their" hunks in conflicted files

I'm currently cherry-picking a number of commits into another (release) branch. I know about the --strategy-option theirs when cherry-picking, but I'm afraid that this option isn't suitable for every commit I'm picking. I'd prefer running with the…
resi
  • 1,738
  • 2
  • 13
  • 14
1
vote
1 answer

Clarification regarding commit pulling terminology : Relationship with git cherry-pick and branches

I am new to git related platforms, currently working primarily with github and gitlab on the side for project purposes. I have a confusion regarding an abstract terminology, it's related to fetching commits(perhaps unmerged or in different branch or…
Skynet094
  • 443
  • 4
  • 19
1
vote
1 answer

My cherry-pick deletes a single file, which does exist on the target, yet it does not auto complete. Why?

I have a commit that deletes a single file: C:\xyz\tmp55 [55 ↑1]> git show 17e645494 commit 17e6454949b44911bc42135e8f12c7f169ef835f Author: Mark Kharitonov Date: Mon Nov 12 11:05:18 2018 -0500 Some changes on MarkFeature diff…
mark
  • 59,016
  • 79
  • 296
  • 580
1
vote
0 answers

Efficient way to cherry pick commits in git

We are following a process where we merge all the feature branches that needs to be released in a Release branch and merge it in master. Recently, we had some issues and we had to revert a release. After reverting, all feature in the release branch…
nak
  • 846
  • 2
  • 10
  • 26
1
vote
1 answer

Cherry-pick with customized old SHA-1 line automatically

If I cherry-pick original commit deadbeef with -x, Git would append a line like (cherry picked from commit deadbeef) Is there any way to customize this message? Like I prefer Backported from: deadbeef Maybe some custom Git alias?
Franklin Yu
  • 8,920
  • 6
  • 43
  • 57
1
vote
1 answer

How can I cherry pick from a TFVC repo to Git repo?

We have just migrated from TFVC to Git and immediately we have a problem - how to cherry pick TFVC commits to Git? Given TFVC branch $/Alice TFVC branch $/Bob Git repo with $/Alice migrated as the alice branch and $/Bob - as the bob branch. The…
mark
  • 59,016
  • 79
  • 296
  • 580
1
vote
1 answer

What are the perils of cherry picking in git between two branches A and B if I am never going to merge between them?

I have read the excellent series of posts by Raymond Chen titled Stop cherry-picking, start merging And I totally understand that cherry-picking is evil if we are going to merge the branches afterwards. But suppose I never merge the two branches.…
mark
  • 59,016
  • 79
  • 296
  • 580
1
vote
1 answer

How to get reference to commits in git

Lets have a git master branch and at some moment lets fork branch for release (release branch will be called R1). Sometimes I need to push commit to both of them(master and R1). Usually I work on master branch, when I'm done I test it, cherry-pick…
Ondrej
  • 817
  • 1
  • 9
  • 16
1
vote
1 answer

Mailchimp RSS campaigns with multiple feeds and groups

I need a Mailchimp expert to give me some insights about how to achieve the following: I need to create RSS Campaigns in Mailchimp, which should be send to users, that are subscribed to specific topics (that is implemented with Groups). The problem…
Yasen Ivanov
  • 973
  • 2
  • 8
  • 22
1
vote
1 answer

git: cherry-pick a list of sibling commits

Due to the workflow of my employer, I am in the situation where I have a parent commit with several child commits, with each child commit being the tip of a different branch: ┌─── b <- branch1 ├─── c <- branch2 ├─── d <-…
p0llard
  • 439
  • 6
  • 17
1
vote
1 answer

how to cherry-pick latest patch from the different developer without conflicts

I have cherry-picked one commit from the other developers for some work. After few hours one of the developer has updated his patch. If i cherry-pick new patch then there are conflicts. Two added files: - in case new files are present in same …
user4828248
  • 39
  • 1
  • 7
1 2 3
…
29 30