how to merge one branch with another gir code example
Example 1: git merge branch to another branch
git checkout targetBranch
git merge sourceBranch
Example 2: merge another branch into current
git checkout branch_name // checkout to branch you want to merge to if not in it already
git merge branch_to_merge_from