Tiny Fishing Hacks Git Merge