|
From: | Dmitry Gutov |
Subject: | Re: Merging release branch |
Date: | Mon, 1 Nov 2021 01:00:48 +0300 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 |
On 31.10.2021 17:46, Lars Ingebrigtsen wrote:
This reminds me -- another advantage to the cherry-picking approach is that the "master" VC history remains clean and easy to understand, while doing all these merges makes it full of noise.
Good point, actually. While cherry-picking is an inherently "dirty" activity, neither the release branch nor the master branch will carry duplicate commits, so they aren't carried over to the future version.
[Prev in Thread] | Current Thread | [Next in Thread] |