The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

CherryPick of merge commit

ostransky
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

TAGS
AUG Leaders

Atlassian Community Events