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

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.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

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!

Leaderboard

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.

Atlassian Community about banner
4,462,330
Community Members
 
Community Events
176
Community Groups

How to merge specific files from another branch on SourceTree

i am working with SourceTree with the Git Flow model.

out of the develop branch i pulled two feature branches (feature3 and feature39)

both features are not yet complete so they have not been merged back to dev.

to be able to continue with feature3 i need some specific file changes made in feature39 (not a whole commit).

searching over the web i found this http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/

which tells me i can checkout specific files from one branch to another. is this possible using SourceTree?

13 answers

1 accepted

4 votes
Answer accepted
KieranA Rising Star Jul 16, 2013

Hi Dani,

You could always cherry-pick commits. I know it's not the same, but you could get diffs from particular commits. Otherwise this isn't currently supported, but looks like a great idea.

Could you file an issue in jira.atlassian.com with as much detail of what you expect as possible? This way we can review it and hopefully incorporate it into SourceTree.

Many thanks

@Dani Avni where did you create the issue?

@Kieran Senior [Atlassian] was this feature applied?

Thanks!

thanks. i opened an issue

hi
any news about this feature?

+1 Really useful to have it

+1 would be great

+1 would be great to have this for when it's really necessary.  smile

 

sorry

wrong input))

not found how to delete message

+1 for this. this is a really common workflow...

+1 for me too!

+1 for this feature, tortoisegit supports it, sourcetree would be perfect if it had this.

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events