Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

CherryPick of merge commit

ostransky July 1, 2021

Hi,

I have a question, situation:

I'm in branche(B.) master and I'm trying CherryPick of commit of B. develop which is merge commit(MC.) of B. feature1 into B. develop. 
SourceTree show me this dialouge:

image.png

When  I choise as a base commit "feature1 commit 2" (which contain change in file feature1.txt) so why is in "Uncommited changes" file feaute2.txt from second parent of MC.  ? 

image.png

and oposite, when I choise "feature2" as a base  so then is in uncommited changes feature1.txt ? 

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events