Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,281 views 5 14
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you