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

How can I get p4merge to recognize conflicts induced by `git cherry-pick`, just the way it does with `git merge`?

I followed this partly cherry-picking a commit with git to cherry-pick changes on only certain files. after the cherry-pick, some files had conflicts, i.e. the files have sections like : <<<<<<<<<<<< >>>>>>>>>>>> normally with git merge, I use my…
teddy teddy
  • 3,025
  • 6
  • 31
  • 48
1
vote
1 answer

which commits got cherry-picked

a basic question probably. I have cherry-picked some commits across branches. Now I would like to get a list of the commits from branch A that got cherry-picked to branch B. Is there a way to do it?
learnAndImprove
  • 1,339
  • 4
  • 15
  • 25
1
vote
1 answer

What relation do two branches have after a git merge (on Xcode)?

Say I had a branch A. I then create branch B, make a bunch of changes and commit. I then merge B into A, but choose to keep the A-version for some parts of some files. (I'm using Xcode to do these, and am not sure about the git command line…
baris
  • 304
  • 2
  • 14
0
votes
1 answer

How could cherry-pick other merge path?

I have this structure: B - C - D <- feature / \ A-----------E <- master ^ mytag B, C and D commits are feature branch path. A is a common base. This feature is merged back into master as E commit. I have tagged (automatically)…
The_Ghost
  • 2,070
  • 15
  • 26
0
votes
1 answer

HG workflow : how to pick/abandon single changesets from branch clones

I think it is common practice of many development teams to create new features or bugfixes in a separate feature clone repository and pull and merge back if the feature/bugfix is ready. However, sometimes I don't want to include all of incoming…
Peter
  • 785
  • 2
  • 7
  • 18
0
votes
3 answers

Do you know why this cherry-pick makes code diff?

I made some commit (C and D) in master branch for hotfix. After this, I cherry pick these commit in develop branch. I guess, If I make Pull Request (base is master, compare is develop), there is no code diff. But there is code diff which includes C…
miro ring
  • 13
  • 2
0
votes
0 answers

Use git log entries to create release notes, without stumbling into cherry picks

I have "main" and "release" branches. People actively commit to "main" and once a month we make a new release. Not everything in main should go into the release branch, but we must pick and choose individual commits. Let's say that in main we have…
Stefano Masini
  • 452
  • 3
  • 11
0
votes
0 answers

Visual Studio 2022 stuck on cherry pick GIT when nothing to commit

I am using VS 2022 and have done a cherry pick. There is nothing left to resolve and all is up to date and yet it is stuck in cherry pick in progress. Am I missing something? Also tried running git cherry-pick --contiue and the result is: Your…
AliK
  • 962
  • 2
  • 10
  • 31
0
votes
0 answers

Git cherry-pick is disabled in Visual Studio 2017

We are cherry-picking commits on release branch and came across an issue where cherry-pick option is disabled for one specific commit. Please see the image below This problem is only with particular commit. We can see this option enabled for…
Imad
  • 7,126
  • 12
  • 55
  • 112
0
votes
0 answers

git cherrypicking with merged commits

I haven't use cherry-picking that much in the past, but I need to use it today. So far the commits are linear so I got no problem But what happen in the following situation I want to cherry pick all the commits from 1 to 7. But from commit 3 to 5…
KansaiRobot
  • 7,564
  • 11
  • 71
  • 150
0
votes
2 answers

How can git log --cherry-pick be parallelized?

I've inherited some code that is using git log --no-merges --right-only --cherry-pick --since='2 months ago' some_tag..origin/master -- path1, path2, ... as an initial step in determining commits that are missing from some_tag. The main problem is…
aviso
  • 2,371
  • 1
  • 14
  • 15
0
votes
4 answers

Git : merge part of changes from branch

We have been working on a work branch for some time now, with the intention of bringing it back to my main branch at some point. In the mean time, that work branch has been kept up-to-date by frequent merges from the main branch. Now it turns out we…
Charles
  • 988
  • 1
  • 11
  • 28
0
votes
2 answers

How can I make a git commit that represents the diff between two other commits?

I'm currently working on a git branch based off of branch main with a HEAD of commit A. I realized I wanted to split the work I was doing into two PRs, but I want to preserve the history properly. An idea I had was to git reset --soft main, unstage…
Matt Hauff
  • 65
  • 7
0
votes
1 answer

How cherry-pick from one branch to another branch without checkout on this branch

I have 3 branches. dev, master, master_copy. Now I am on the master branch and a need cherry-pick commit from dev branch to master_copy WITHOUT checkout to master_copy or dev branch. How I can do this? I need like this cherry-pick dev…
Kot Psihopat
  • 13
  • 3
0
votes
0 answers

GIT Behind/Ahead Counter as a way to track deployed features

I am working on a project, and we have many people working on it. We have 2 branches: main develop When someone gets a task, they make a new branch for their task derived from develop and once they finish it it is approved via pull request to the…
Apollyion
  • 21
  • 1
1 2 3
…
29 30