Author: Jonathan Hall

Posted on

Avoid Merge Conflicts, Don’t Manage Them

Featured Imgs 23

When discussing continuous integration on the interwebs, inevitably someone pops into the conversation with this hand grenade of wisdom:

BUT ACTUALLY… you don’t need continuous integration. It’s good enough to just merge mainline into your feature branch regularly. You get the same benefit, without the effort of changing your workflow.