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?

10 answers

1 accepted

This widget could not be displayed.

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

This widget could not be displayed.

@Dani Avni where did you create the issue?

@Kieran Senior [Atlassian] was this feature applied?

Thanks!

This widget could not be displayed.

thanks. i opened an issue

hi
any news about this feature?

This widget could not be displayed.

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

This widget could not be displayed.

+1 for me too!

This widget could not be displayed.

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

This widget could not be displayed.

+1

This widget could not be displayed.

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

 

sorry

wrong input))

not found how to delete message

This widget could not be displayed.

+1 would be great

This widget could not be displayed.

+1 Really useful to have it

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

710 views 1 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