Daniel Sahlberg <dsahlb...@apache.org> writes: > Log: > On branch pristine-checksum-salt: > > Catchup merge with trunk
`pristine-checksum-salt` is branched off from branches/pristine-checksum-kind (rather than from trunk), so in this case it should probably be better to merge the trunk changes into the parent branch first, and propagate them into the `pristine-checksum-salt` branch from parent. Thanks, Evgeny Kotkov