Keep the changelog, avoid the conflicts7 points by domenkozarRead the articleDiscussion on Hacker News