DEV Community

Discussion on: The Git Rebase Introduction I Wish I'd Had

Collapse
 
glutnix profile image
Brett Taylor

I think it would be amiss to omit git mergetool from any rebate merge conflict workflow. Installing kdiff3 or p4merge will typically add their necessary lines to your global gitconfig.