Earn badges and make progress
You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Participate in fun challenges
Challenges come and go, but your rewards stay with you. Do more to earn more!
Gift kudos to your peers
What goes around comes around! Share the love by gifting kudos to your peers.
Rise up in the ranks
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Come for the products,
stay for the community
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
CherryPick of merge commit
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:
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. ?
and oposite, when I choise "feature2" as a base so then is in uncommited changes feature1.txt ?