@Mariatta @abadger I've cleaned things up a bit. Maybe it's time to move helper functions into util module/package or is it a task for separate PR?

Hi @Mariatta,

I'm currently waiting for your approval wrt architectural changes. After that I'll proceed with adjusting/adding tests.

P.S. @abadger suggested that I could add a CLI command for git config --local --remove-section cherry-picker but I'm doubtful: it's a dangerous thing for the flow and providing users with such UI might encourage them to overuse it where they don't understand consequences. Ideally, that failure shouldn't be happening during the normal process at all.

Sorry for the delay. Will take a look in the weekend.

Cool, thanks :)

Hey @Mariatta, any 🤔💭 on this so far?

Hi @Mariatta, any comments?

So sorry, I think I'm not able to effectively review this PR.
Is there anyone else who might be able to help review this?

@Mariatta
Well, @abadger said that it's fine. We just wanted to check that it's fine with you since you're the maintainer.

I'll ask @asvetlov to take a look as well, then, to have more eyes on it.

Thanks for the review, Andrew! I just wanted to wait for architectural approval before investing some time into tests. Now I can proceed :)

Thanks @webknjaz and @asvetlov. For me, as long as there is no change to how it works for CPython /miss-islington’s purpose, then I'm good with it.

Great, thanks @Mariatta!

Update: with the recent commits I've hit 83% test coverage.

@Mariatta @abadger @asvetlov I believe this is ready for the final review :)

It seems ok to me. Would @abadger or @asvetlov be able to do more thorough review?

Thanks. I'll ping them. I think Andrew is away for a couple of days, though...

Thanks @asvetlov and @webknjaz. If you could update the release notes and up the version, I can merge and get it deployed to PyPI.

Sure, on it

done!

Thanks! Will release soon!