Merge correctly

Open Government Products

Require confirmation when you deviate from your git merge workflow. Configure this extension through extension

Screenshots from Chrome Web Store