I was asked recently about the best practice for using GitFlow with continuous integration. For those who do not know, this is GitFlow:
 and they don't track their levels of re-work, lost changes, or conflict resolution. In 2010, GitFlow felt good. We could keep Master "clean". That was almost a decade ago. Testing was still mostly manual. We were still on Java 6. NodeJS was barely a thing. Time to modernize. We don't keep Master clean with add process. We keep it clean with automation.
Other examples:
Update March 2020: I asked the author of GitFlow if he could clarify the use cases to stop the GitFlow whack-a-mole and he very helpfully did so, Please thank him.
Tags: lean, cd, source management