Beyond Compare - Github

git fetch origin git checkout your-feature-branch git merge main # Conflict messages appear

# Set Beyond Compare as the diff tool git config --global diff.tool bc git config --global difftool.bc.path "/usr/local/bin/bcomp" # macOS/Linux example # Windows example: "C:/Program Files/Beyond Compare 4/BComp.exe" github beyond compare

You can’t easily compare entire folders or branches side-by-side locally. git fetch origin git checkout your-feature-branch git merge