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

git cherry-picked commit, but files whole replaced, how can I recalculate difference?

I made cherry-pick of a commit from the feature branch to the master branch. But these changed files was moved to another folder in master-branch. So I have used follow answer to merge moved files: git merge conflict due to moved files But now I…
Kirill Golikov
  • 1,354
  • 1
  • 13
  • 27
0
votes
1 answer

git cherry-pick usage after pushing

I did not realize I had messed up by not checking out master when creating new branches, so now I have a messed up git tree. I experimented already with git cherry-pick but documentation was not enough to understand how to fix my issue, since I…
Arcca
  • 3
  • 2
0
votes
1 answer

How to cherry publish my components library?

I have a Vue components library which is all developed under the same repository, as repository per component is not sustainable. Out of the box, I can only publish it as a whole, but I want to be able to publish it both as a whole (like lodash) and…
adi518
  • 863
  • 1
  • 11
  • 19
0
votes
0 answers

Logic of conflict resolution

I have simple test repository - just 1 file and several commits (creation of the repository is described at the end). I'm trying two variants of cherry-pick operations and I don't understand logic of conflict resolution: If I do: git cherry-pick…
avk700
  • 11
  • 2
0
votes
1 answer

find the "rebase -m" starting point

Recently I am using git checkout dev_branch -b merge_branch git rebase -m merge_branch master git checkout master git rebase merge_branch to do a merge rebase. As the help document indicates, merge_branch is first reset to HEAD of master and then…
Eric Sun
  • 777
  • 6
  • 20
0
votes
0 answers

GIT - Group all the changes made in different branches

sometimes the developers push the work related to a single ticket into different branches, the name of the branch always contain the ticket code (example: "Ticket-002_added_objects" (where "Ticket-002" is the code of the ticket). In sourceTree: if I…
Gabriele
  • 3
  • 2
0
votes
1 answer

How to exclude a specific merged branch's commit from the master branch in Git?

I have a master and a develop branch. Feature and hotfix branches are merged into develop, and from time-to-time develop is merged into master. Now i have a request to exclude a specific hotfix from the master branch. Is this possible somehow? It…
passatgt
  • 4,234
  • 4
  • 40
  • 54
0
votes
1 answer

Git cherry pick a feature consisted of discrete commits

I'm very new to Git, so any excessively detailed explanation is appreciated : ) Say, I have a game application that is released in two countries. Actually I have two code repositories for this application, which have the same architecture but…
Chengteng Li
  • 11
  • 1
  • 4
0
votes
1 answer

How to cherry pic and add a second patch to the first cherry picked patch?

I have two branches branch A and branch B in GIT project. where i have committed a code to branch A which is patch 1. Then cherry picked patch 1 of branch A to branch B. later i gave a second patch (patch 2) to the same commit in branch A. How to…
Vedavyas Velaga
  • 111
  • 1
  • 1
  • 9
0
votes
1 answer

Git cherry-pick fail

I have a local brand new branch and I want to cherry pick some commits. A few picks ran OK but the next one produced a conflict: >git cherry-pick 676b371 error: could not apply 676b371... fixed connection resolution. hint: after resolving the…
UserControl
  • 14,766
  • 20
  • 100
  • 187
0
votes
0 answers

apply changes to other files via git?

I have a git repo with lots of quite similar files (something like config files). It often happens that I have to do a certain change to all of those files (change a parameter value or add a new parameter). Does anyone know a way of doing this…
Roman
  • 707
  • 8
  • 16
0
votes
1 answer

How to linearize “splintered” merging history in Git?

I have read through the basics of the git book trying to linearize the branch red from with the branch blue got merged into. To easier review the history I try to have only one branch and no junction. What options do I have to do this and what is…
droid192
  • 2,011
  • 26
  • 43
0
votes
0 answers

I am trying to cherry-pick a commit but I get an error

I am trying to cherry-pick a commit but I get an error: Packaging has failed due to cherry-picking (rebase) failure Caused by: Commit refs/changes/26/1452826/9 cherry-picking failed due to failing file(s):…
Sandip Kumar
  • 129
  • 2
  • 11
0
votes
1 answer

Branch rescue: cherry-pick merge commits?

I need to rescue a feature branch which got some duplicated commits due to a rebase fail. Currently the only way to fix it is to cherry-pick all commits off this feature branch into master (see background below). We started with the most recent…
cgross
  • 1,932
  • 2
  • 15
  • 20
1 2 3
…
29 30