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
2
votes
1 answer

`git svn dcommit` failing on a branch

I have been using git-svn to communicate with my company’s svn repo for a while now without any major headaches. Today, the “headache”-part changed dramatically: I’ve been working on master/trunk pretty exclusively, and needed to merge most (but not…
danyowdee
  • 4,658
  • 2
  • 20
  • 35
2
votes
2 answers

Is there a way to apply git commits from one part of my tree into another?

In the dim and distant past there was a decision to break compatibility with one of our configuration programs. However as there would still be remote units running older software we needed to keep a version of the old mgmt software around in the…
stsquad
  • 5,712
  • 3
  • 36
  • 54
1
vote
1 answer

which commit was cherry-picked?

How can you find out which commit was used in a cherry-pick operation? git reflog only seems to show the resulting commit Sha-1 after the cherry-pick is merged and commited. We need to find the original commit prior to that. Why? It's because we…
Wayne
  • 2,959
  • 3
  • 30
  • 48
1
vote
1 answer

apply cherry pick

I got a simple question for you GIT masters: in GIT man pages I've got this for man git-cherry-pick ... git-cherry-pick - Apply the changes introduced by some existing commits ... My doubt is: when I cherry-pick a commit to another branch, this…
AndreDurao
  • 5,600
  • 7
  • 41
  • 61
1
vote
2 answers

Working with git on two computer (with github)

I'have a python project and I decide today put it on github. I'm newbie with that. I see several tutorial. All work fine exept a thing I want to do: I'm coding on my laptop in the day and on my computer I continue the work when I come back home.For…
Jean-Francois Gallant
  • 13,583
  • 6
  • 20
  • 24
1
vote
1 answer

Can git cherry picking last commit from throw-away branch damage the history in branch where data will be moved to?

I've read about the unwanted side effects of cherry picking in regards to git history and ability to merge. However all examples I've come across assume that the branch, where a commit is cherry picked from, will continue to be actively…
rbaleksandar
  • 8,713
  • 7
  • 76
  • 161
1
vote
0 answers

Is there any way to see which commit is cherry-picked to a commit?

Assume that there are two branch develop and master. They are like this (alphabets are commits), master was created based on develop at B: A — B — C — D (develop) A — B — E — F — (C cherry-picked) — G — H (master) How can I confirm C cherry-picked…
kensuke1984
  • 949
  • 1
  • 11
  • 21
1
vote
2 answers

Can I use rebase to update my feature branch to avoid polluting my commits even if the pull request may go stale?

I have a Develop branch that is actively getting committed to a lot. Before I start my work I like to create a feature branch off of Develop. However, before I submit a pull request for it, I like to proactively resolve merge conflicts. So what I…
Eric
  • 476
  • 2
  • 8
  • 20
1
vote
0 answers

After Cherry Pick in Azure DevOps, source branch still showing merged changes

We have dev, release, and master branches. On the Dev branch, we have 10 Pull requests and I want to merge only 5 pull requests from Dev to the release branch, so I used cherry-pick option and merged 5 pull requests into the release branch. and that…
Shashi
  • 11
  • 1
1
vote
1 answer

Encountered conflicts when cherry-picking commit . This operation needs to be performed locally error in Azure DevOps

I need to merge changes from one branch (this branch originated from the demo branch) let's say feature1FromDemo to another branch (beta). There is a difference in the source code of the beta and demo branches, So I cannot raise a PR directly from…
Vivek Nuna
  • 25,472
  • 25
  • 109
  • 197
1
vote
1 answer

What should I do when I’m working on my branch and some push changes on mainline

it was the work flow, Created my branch using checkout. Commit my changes on my branch 5 days ago. Edit some of it on same branch and commit (not merged, on review). Found that there is version set issue because someone merged changes on main…
Devep
  • 23
  • 4
1
vote
2 answers

How can I track a subset of files from a remote repository?

I'm trying to solve the following situation: I'd like to include a (not owned, public) project into mine, resizing a little bit the original file tree by removing redundant and/or not-needed files, and only leaving the bare minimum, BUT also…
Lachmann
  • 13
  • 2
1
vote
3 answers

How to merge/cherry-pick a single commit

I've got a project (GitHub-based) with a branch structure like so master: A - B - C - D \ release: W - X - M / bugfix: Y - Z Thus once bugfix is merged, release will have A - W - X - Y - Z - M, where M…
Joshua Boniface
  • 143
  • 6
1
vote
1 answer

Azure DevOps - Cherry-Picking Into master branch

I have a scenario where I will sometimes need to cherry-pick some commits from our UAT branch into our MASTER branch. This is because the business sometimes will request that only specific "features" are moved from UAT to production. I need to be…
Eric Elliston
  • 65
  • 1
  • 8
1
vote
1 answer

git mess -- how to unscramble cherry picked branches

I have inherited a repo with five or six branches that are not merged into master, and I have to figure out what is in them. I have been using SourceTree to get a graphical view of the branching relationships. Unfortunately, it looks like a LOT of…
rimiha
  • 57
  • 5
1 2 3
…
29 30