From kde-release-team  Fri Aug 06 19:27:43 2021
From: Heiko Becker <heiko.becker () kde ! org>
Date: Fri, 06 Aug 2021 19:27:43 +0000
To: kde-release-team
Subject: Re: Fwd: Last Minute Dolphin Merge
Message-Id: <0cbe8490-c74a-48c9-96ce-060db4534e5f () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-release-team&m=162827805130741

On Friday, 6 August 2021 19:12:19 CEST, Nate Graham wrote:
> Done. Release folks, can you please add the revert commit=20
> (63e12c0cdf4e3437b95b9c50e5791dbf97183687) to the tarball?=20
> Thanks!

Done. New tarball up

63e12c0cdf4e3437b95b9c50e5791dbf97183687
SHA256: 5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1=20
dolphin-21.08.0.tar.xz

> And now a git question. How can we avoid picking up these=20
> revert commits on master the next time anyone does a merge from=20
> stable to master?

I'd say merge to master and revert the reverted commits.

Regards,
Heiko