On Sat, May 22, 2021 at 06:21:18PM +0200, Stefan Sperling wrote:
> The merge logic used by 'got cherrypick' has a flaw that causes unrelated
> changes to show up in merge results sometimes. This also affects 'rebase'
> and 'histedit' which rely on the same code to merge changes.

This should now be fixed in the repository's main branch. Testing welcome!