git compare two branches and merge code example

Example 1: git merge diff between branches

Just store diff into a patch file, edit patch if needed and apply patch:
git diff commitid1 commitid2 > file.patch #edit diff to merge in file
git apply file.patch	#Apply diff of patch file into current branch

Example 2: git compare two branches

git diff branch1..branch2