How to merge specific files from another branch on SourceTree

Dani_Avni
Contributor
July 16, 2013

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
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
July 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

2 votes
teoman sipahi
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
February 1, 2016

@Dani Avni where did you create the issue?

@Kieran Senior [Atlassian] was this feature applied?

Thanks!

1 vote
Dani_Avni
Contributor
July 16, 2013

thanks. i opened an issue

rossanoua September 14, 2017

hi
any news about this feature?

0 votes
John Perry July 10, 2020

+1

0 votes
Samuel Arminana
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
July 3, 2020

+1

0 votes
Christopher Smit June 24, 2020

+1

0 votes
sorakalidis
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 19, 2018

+1 Really useful to have it

0 votes
rossanoua September 14, 2017

+1 would be great

0 votes
Dennis V McEnaney
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
December 9, 2015

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

 

rossanoua September 14, 2017

sorry

wrong input))

not found how to delete message

0 votes
Artemiy Utekhin
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
May 30, 2015

+1

0 votes
btburton42
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
February 6, 2015

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

0 votes
Piermaria Maraziti
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
July 8, 2014

+1 for me too!

0 votes
Cal Leeming
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
November 24, 2013

+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
AUG Leaders

Atlassian Community Events