This week I want to merge a huge set of patches on a new branch of an upstream project. I wrote the changes myself so I'm familiar with the code but it's always a PITA to merge them properly. I will see if Claude Opus can do it for me...