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
0
votes
2 answers

How to recover from this Git setup

My small team of database developers and I started using Git for version control 6 months ago. We have 1 development instance and 1 production instance right now. When I set up Git for the team, I created the "MASTER" branch, then put everything…
Stan
  • 7
  • 4
0
votes
1 answer

git cherry shows a new commit as cherry-picked when an identical commit was cherry-picked in the past

Assume that there are two branches branch1 and branch2 and there is a test.txt on both the branches with the following line "opt:true". Change the value from "true" to "false" on both the branches. On branch1, change the value from "false" to "true"…
Kiran
  • 9
  • 2
0
votes
1 answer

Which git feature should I use for breaking big commit (pushed and reversed) into smaller commits?

I use Atlassian SourceTree to work with git repository. I committed and pushed big commit where desired and undesired changes were mixed. I rolled it back by committing and pushing Reverse Commit. Now I want to extract desired changes from that big…
alpav
  • 2,972
  • 3
  • 37
  • 47
0
votes
1 answer

Create patch from two commits not in sequence not at the head

I have a repo with a single branch and 10 commits. I want to create a patch for all the commits affecting two of the files in the repo, say for example commits #3, 4, and 7, ie not the head, not in sequence, and not labeled. I've kept the scope of…
JohnC
  • 1,797
  • 1
  • 18
  • 26
0
votes
0 answers

Cherry-picking from github: pick only the commit's new code

When I do cherry-pick from github, it usually adds code that is not from the commit, but that I don't have in my files. Is there any way to tell cherry-pick to only add the code that is new from the commit I want to cherry-pick?
yaymalaga
  • 33
  • 1
  • 6
0
votes
0 answers

Git cherry-pick doesn't work as expected (integrates more than one commit)

I try to understand git cherry-pick command but it seems not to work as expected. My git tree : A -- B -- C -- H -- I -- J MASTER \ D -- E -- F -- G TEST I just want cherry-pick F in master branch, so I did : git…
Guilhem G.
  • 97
  • 1
  • 9
0
votes
1 answer

How to cherry-pick a range of commits but stop for amending?

To pick a single commit: git cherry-pick A To pick a single commit, but stop for ammending: git cherry-pick A -n To pick a range of commits: git cherry-pick A..B However, what do I do if I want to pick a range of commits, but amend each commit?…
Alexander Popov
  • 23,073
  • 19
  • 91
  • 130
0
votes
1 answer

cherrypick some updates and then push to gerrit cause gerrit build failed

I have a question about whether should push cherrypicked update to gerrit. My code needs some other code in order to build, and those code is already pushed to gerrit but not merged. I cherrypicked that push and put my code on the top of it. And my…
ratzip
  • 1,571
  • 7
  • 28
  • 53
0
votes
3 answers

What is the simplest way to fix a single broken line in a committed Mercurial changeset?

I frequently run into a use case where I identify a small bug in a committed changeset far after the fact so that reverting the changeset is not an option. I've looked at similar questions and the Mercurial docs for graft and general advice on…
arclight
  • 1,608
  • 1
  • 15
  • 19
0
votes
1 answer

Cherry picking problems

Branches and commits mb: A -> B -> C -> G -> H -> I \ db: -> D -> E -> F Progress both on db (develop branch) and mb (master). Rebasing is what I usually do. Always, actually. But, when on "F" rebasing against mb not…
mira_mayhem
  • 155
  • 2
  • 13
0
votes
1 answer

Mercurial: cross-version merges / massive cherry-picking

Situation We have 2 versions (1.0 and 2.0) of a project that are both actively maintained. It is basically the same project (as far as changes go), but being based on different base versions (base1.0 and base2.0). Everything that is changed in 1.0…
Hemisphera
  • 816
  • 6
  • 23
0
votes
1 answer

Git is conflicting during merge, but the file looks the same. Why?

I'm getting a merge conflict on a file that looks to be exactly the same in both branches. First the change was made to dev. Second hand copied to mybranch. Merge mybranch into dev I need to merge mybranch into dev, and this is what I get:…
Justin
  • 2,940
  • 3
  • 25
  • 43
0
votes
1 answer

svn:mergeinfo is not being cherry-picked properly between branches

I created a ^sandbox/feature-branch from ^trunk as a staging area to do a proof of concept. But I don't want to reintegrate merge the feature branch back into ^trunk because of the sandbox in its name. I'd like to create a ^branches/feature-branch…
Michael O'Cleirigh
  • 65
  • 1
  • 7
0
votes
1 answer

how to cherry pick a patch with all its dependencies?

I have seen these 2 posts: https://code.google.com/p/gerrit/issues/detail?id=1123 https://groups.google.com/forum/#!msg/repo-discuss/qlP-Yxlxg68/yWJxZVR9mnQJ Is it enabled or not?
0x90
  • 39,472
  • 36
  • 165
  • 245
0
votes
1 answer

cherrypy: server side code of getting image by http post and storing its path mysqldatabase

m*cherrypy:python*y project is on iphone app...it require to manage profile of every user i need to upload image and store its path in database. im working on server side coding cherrypy framewok..i need to get image by http post and store its…
Bhartendu Bharti
  • 71
  • 2
  • 10
1 2 3
…
29 30