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

weird git cherry-pick behaviour

I have a commit on a different branch that simply adds a bunch of files in a new directory. Let's say the commit has id 123456 and it adds a directory called foo full of stuff. Now in my other branch, from a clean working tree, I do git cherry-pick…
artfulrobot
  • 20,637
  • 11
  • 55
  • 81
0
votes
1 answer

how to use pysvn.Client.merge_peg2 to achieve cherry-pick merge

How can I use the pysvn.client merge related functions to achieve the cherry-pick merge, merge specific revisions (or revision ranges) from one branch to another, svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH] Now I'm use…
nullscu
  • 1
  • 1
0
votes
1 answer

Git Maintain two branches history and be able to git push

I have two branches that look like this o--o--A--B-C--D env1 (master), cherry-picking from env2 \ X--C--D env2 Only different between these two branches is environment settings. I want to maintain these two branches because it's…
Xuphey
  • 50
  • 5
0
votes
1 answer

Git: find new cherries

I've set up a process, based on Adam Spiers' answer in a previous SO thread, to periodically publish a Git repository to a path in an SVN repository. Everything is working quite well, but there's one piece I haven't figured out. When I'm grabbing…
Ken Williams
  • 22,756
  • 10
  • 85
  • 147
0
votes
2 answers

git shortlog: how to exclude "(cherry picked from commit ____)" blah?

git shortlog is handy for making a human-readable summary of changes. However, when I cherry-pick changes from the master branch I use the -x flag to git cherry-pick because it records which commit it picked from. This causes some ugliness in the…
Dan Stowell
  • 4,618
  • 2
  • 20
  • 30
0
votes
3 answers

How to pick some files in a commit using Git

In one of the commits that I want to cherry-pick from Branch B to Branch A, there are four files that changed, but I only want one of the files in that commit to be on Branch A. How do I get that file on Branch A? Thanks!
BJ Dela Cruz
  • 5,194
  • 13
  • 51
  • 84
0
votes
1 answer

git cherry-pick causes branch ahead of origin/master

I'm trying to merge specific commits from a branch into master, and push them to origin. Here is what I'm doing: M4600 ~/git/plutext/docx4j (master) $ git reset --hard origin/master HEAD is now at 2b2d124 Image support in non-XSLT HTML…
JasonPlutext
  • 15,352
  • 4
  • 44
  • 84
-1
votes
1 answer

GIT Cherry–Picking Commits Out Of Order

I have 1 file I modify code on one part of the file and do commit A I modify code on another part of the file and do commit B If I cherry–pick Commit B from source to release first, and then Commit A at a later late, will the changes from Commit B…
K. Ventura
  • 91
  • 2
  • 14
-1
votes
1 answer

How to make git cherry pick use fast forward technique

By using git cherry-pick, I've been trying to specifically merge the last commit from one branch to another. But it always results in a merge conflict, when it actually shouldn't. Following is what I've been doing, and it always results in…
ansme
  • 413
  • 2
  • 11
-1
votes
1 answer

Cherry pick specific commits from development branch to production branch

I have two branches in the GIT GUI - Development and Production. When code is pushed onto development, in the CLI, I do git pull and then git merge and git push on the production branch. If I have 3 commits on the CLI on development branch: Commit1…
Karan Saxena
  • 49
  • 12
-1
votes
1 answer

Managing GIT Flow when multiple developers are working on the same file

I have been working on a large scale project which is causing conflicts when multiple developers end up working on the same file in the same repo. Here is an example of the scenario: Assume there are 2 developers, Foo and Bar. Foo needs to make…
Chirag Modi
  • 1
  • 3
-1
votes
2 answers

How far back does git cherry-pick go?

Suppose I have done the following: Create branch My-new-feature from master My-new-feature code changes part 1 merge from (a recently pulled) master locally My-new-feature code changes part 2 Create branch release-2 from master merge from (a…
Michael Malak
  • 628
  • 8
  • 19
-1
votes
2 answers

what happens to changes if I abort a cherry pick?

I am using azure devops and I have made changes, but also added a commit message. The only option is to abort the cherry-pick. It will not let me commit even though I have a commit message and changes have been made. What happens to my current…
aworkinghuman
  • 128
  • 1
  • 8
-1
votes
1 answer

How to reduce the merge-redundancy, which is used to make sure master is the root of all, in our Git workflow?

We use the "Git workflow" by Vincent Driessen, 2 long lived branches master/dev. We believe we need 2 long lived branches instead of one in github flow because we do enterprise (2B) business. Our customer prefer a stable product over our latest…
Qiulang
  • 10,295
  • 11
  • 80
  • 129
-1
votes
2 answers

Can I cherry pick multiple commits from different branches?

I have 3 branches, m being head of master, while g and h are single commit branches. I cannot do a rebase or merge at this point. What I want is to cherry pick the changes in g and h on top of master without commiting them, just having them…
Ionut Duduc
  • 1
  • 1
  • 1
1 2 3
…
29
30