7. Git Compare two branches and Merge files from different branches
Git Compare two branches and Merge files from different branches:
git branch –a
git checkout –b BranchName
git diff BranchName1 BranchName2
git difftool BranchName1 BranchName2
git checkout BranchName
git branch –d BranchName
Git merge BranchName