How to apply commits from one branch to another branch (tree structure is different) in GIT?

Question

I have two branch in one repository that I need to maintain for 2 different deliveries.
Say branch1 and branch2 in test.git repo.

test.git
- branch1
foo_v1/text.txt
foo_v2/text.txt
- branch2
foo/text.txt

branch1 is developers branch all source looks version'ed manner and branch2 is superset for branch1, example foo_v1 and foo_v2 are the directories in branch1 where developer will update the latest one here foo_v2 and branch2 foo is same as the latest one of branch1 for an instance.

Suppose developer send 10 patches on branch1 where are changes in terms of _/ then I need to apply on my local repo branch1, till now is fine then I need to apply same 10 patches on to my branch2 where source tree which is quite question here how can I do.

Answer 1

You might be able to use the subtree option in recursive merge. Try something like:

 git cherry-pick -X subtree=foo 

This tells git to apply the changes to the "foo" directory in your current branch (branch2).

Comments

How do I do this? Suppose I'm in branch1 with two commits on foo_v2 and I need to apply them
on branch2 where in foo.

---

Since this uses cherry-pick, the changes that you want to apply have to be on branch1 already.

Let's say your branch1 looks like:
 --A--B--C--D
and branch2 looks like:
 --1--2--3--4

And you want to apply commits B and C on branch2, but they modify "foo_v1/" on branch1. You can tell git to apply the commits onto the directory "foo/" on branch2:
 git checkout branch2 # make sure you're on branch2
 git cherry-pick -X subtree=foo B C # pick the commits

If there's no conflict, the commits should apply cleanly, and your branch2 would become like:
 --1--2--3--4--B'--C'--