Post B5dL8QMKYw5NfwB4V6 by ar@is-a.cat
 (DIR) More posts by ar@is-a.cat
 (DIR) Post #B5cfFSA63vmrDc7mMa by ptrc@social.treehouse.systems
       1 likes, 0 repeats
       
       how nice of mozilla to provide a list of shame directly on their bugzilla
       
 (DIR) Post #B5cfFTXAxbqHTTviyW by ptrc@social.treehouse.systems
       0 likes, 0 repeats
       
       and 90% of them is just four names repeating, good to know
       
 (DIR) Post #B5cfFUpe8QD9V3ZzP6 by ptrc@social.treehouse.systems
       1 likes, 0 repeats
       
       One of the common complaints we hear about uplifts is that it's difficult to manage which specific commits need to be cherry-picked and to resolve conflicts when they happen on the target branch.This is something that I believe a Claude skill could help to improve.okay but have you considered that. uplifting something into a stable release probably should not be handled by an unreliable slop machine
       
 (DIR) Post #B5cfFWEUvVgTqQDLmK by ptrc@social.treehouse.systems
       1 likes, 0 repeats
       
       like yes obviously it's difficult when you have trees that diverged a month agobut this is why it needs extra care to make sure it's properly backported and not just slopped up ;~;
       
 (DIR) Post #B5cfRVa9AjTlIj3dB2 by domi@donotsta.re
       0 likes, 0 repeats
       
       @ptrc men will literally use GenAI instead of learning how to git rebase -i effectivelyi bet it’s a lot of conflicts, but i’d be “impressed” (neg) if the claude output of this cherry-pick even compiles
       
 (DIR) Post #B5chGmiTKK59AHxwgq by bovine3dom@masto.ai
       0 likes, 0 repeats
       
       @domi @ptrci find https://mergiraf.org/ helps to make the remaining conflicts be actual conflicts
       
 (DIR) Post #B5chGmuWbVitlfbZTc by ptrc@social.treehouse.systems
       1 likes, 0 repeats
       
       @bovine3dom @domi that, and stuff like zdiff3 / rererelike really, it's just a skill issue on their part
       
 (DIR) Post #B5chWzEmXcUCdEnvRQ by IngaLovinde@embracing.space
       0 likes, 0 repeats
       
       @domi @ptrc > but i’d be “impressed” (neg) if the claude output of this cherry-pick even compilesClaude code probably has something like```do {    try to merge sloppily} while (not compiles)```in it, judging by what people were writing about it on here: https://neuromatch.social/@jonny/116329100608733645
       
 (DIR) Post #B5dL8QMKYw5NfwB4V6 by ar@is-a.cat
       0 likes, 0 repeats
       
       @IngaLovinde @domi @ptrc not sure about code, but different format outputters (eg. json, xml) literally work like that, at least with some slopgenerators/wrappers around them
       
 (DIR) Post #B5eTcWWBDpKuFubkaO by bovine3dom@masto.ai
       0 likes, 0 repeats
       
       @ptrc this is a skill issue i also have :(i think about half the time i have had a complicated merge i have found it easier to rewrite it by handi hadn't heard of zdiff3 📝@domi
       
 (DIR) Post #B5eTcWnYBFEN7mjcf2 by markstos@urbanists.social
       0 likes, 0 repeats
       
       @bovine3dom @ptrc @domi Manual conflict resolution is hard. Having done that many times and also tried Claude for that, Claude is faster and at least as accurate. A first pass with Claude with manual review is winning combination.
       
 (DIR) Post #B5eTcX2RHt8lrxhVrs by domi@donotsta.re
       0 likes, 0 repeats
       
       @markstos @bovine3dom @ptrc skill issue, learn git
       
 (DIR) Post #B5eaoH6D4ez5aa0kaG by markstos@urbanists.social
       0 likes, 0 repeats
       
       @domi @bovine3dom @ptrc  Ha, I'm quite experienced with git. The challenge is not git, but that reading complex merge diffs is inherently hard. It's not a natural way to read code.  Claude is quite good at understanding the surrounding context and desired state and stitching it back together. I then confirm the final state is the intended merge state, as the proposed resolutions are *much* easier to read than the diffs.
       
 (DIR) Post #B5eaoHJgGZlAGMJVa4 by ptrc@social.treehouse.systems
       1 likes, 0 repeats
       
       @markstos @domi @bovine3dom oh poor baby 🥺🥺 do you need the robot to reassemble the files from conflict markers for you? 🥺🥺 yeah? 🥺🥺 do you need the bo-bot to analyze the code for you too? yeah ??? you can't do it?? 🥺🥺
       
 (DIR) Post #B5easBGsgTJQfkrgoa by domi@donotsta.re
       0 likes, 0 repeats
       
       @ptrc this is someone’s kink
       
 (DIR) Post #B5ebEOvEbwmTNfKrOC by bovine3dom@masto.ai
       1 likes, 0 repeats
       
       @ptrc @markstos @domiif you told me ten years ago that in the future people would argue about whether it was ok to use graphics cards to solve merge conflicts i would have been confused