Is there a way in git to merge two branches without merging the file? In other words, just draw a merge arrow.
Say I have branches A and B. I need to merge branch B into A, but you do not need all the changes in B, but most likely you need to bind the branches together.
git checkout A
git merge B --no need changes
In general, there is a way to merge two branches without submodules. I want to save the submodules, as in branch A, and still need to merge branch B.
Update
git merge -s our BRANCH_NAME worked for me.
source
share