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?

9 answers

1 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

thanks. i opened an issue

hi
any news about this feature?

@Dani Avni where did you create the issue?

@Kieran Senior [Atlassian] was this feature applied?

Thanks!

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

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

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

 

sorry

wrong input))

not found how to delete message

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

273 views 0 3
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot