Git folder merge between branches -

Git folder merge between branches -

i have 2 branches

master

| _ folder1

| _ folder2

releases

| _ folder1

| _ folder2

both have same folder structure.

how can merge 1 folder master branch release branch, folder1

from give-and-take in comments assume 2 things:

changes in folder1and folder2 independent. there changes on master branch (at to the lowest degree folder1).

subsequently, next instructions overwrite changes made folder1 on release branch. re-create files in folder1 on master release.

check out release branch.

git checkout release

then, checkout files in folder1 master branch. doing so, leaves release checked out branch. also, file added staging index.

git checkout master -- folder1

commit changes.

git commit -m "copy on changed files in folder1 master branch."

git-merge