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

Is there a way to do a merge from one branch to another but file-by-file?

I have two branches that have diverged. I need to merge *most* of /master into the new branch but not all of it. I tried "Merge master into current branch" but it, of course, overwrote files I didn't want it to.  I'm hoping to find some sort of "manual-but-not-manual merge" where it would prompt me for each change and I could step through and select which ones to merge.

I can do this in WinMerge (and have been) but it takes a LONG time to generate the diff.

Does SourceTree have anything like this?

1 answer

0 votes
minnsey Atlassian Team Aug 22, 2018

Hi

It depends if your file changes are cleanly encapsulated by atomic single file commits.

If they are then you could use either cherry-picking, if you want history, or patch files, if history doesn't matter. Either of which can be done in Sourcetree.

If they aren't then I think you are in to the world of rebasing. The following gives some pointers https://stackoverflow.com/a/449632. Sourcetree can help with this, but you may well find it easier to follow the examples using the command line.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,989 views 0 12
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