I have a branch A with a folder named foo
. Another branch named B has only the content of the folder foo
. Is it possible to merge the branch B into the folder foo
of branch A?
The branch A contains for example
foo/
hello_world.c
goo/
AliceAndTom.c
The branch B contains only the content of the folder foo/
./
hello_world.c
hello_world.h
The result I want in the branch A after merging branch B:
foo/
hello_world.c
hello_world.h
goo/
AliceAndTom.c
Edit:
branch B was created using git command git filter-branch --subdirectory-filter dir/to/filter -- subdir_branch