Top
Best
New

Posted by Velocifyer 11/3/2025

Mergiraf: Syntax-Aware Merging for Git(lwn.net)
163 points | 45 commentspage 2
James_K 11/13/2025|
Very interesting to see what Tree Sitter starting to get used for more things.
virajk_31 11/13/2025||
I really liked the last section of your article, thanks for the numbers
sysguest 11/13/2025||
finally...

I've been using 1-arg-1-line to avoid most conflicts

Cthulhu_ 11/13/2025|
I've been doing some SQL again and one technique I learned years ago was having each thing on its own line, both to reduce churn in version control and allow for easier reordering and commenting out.

Instead of

    SELECT foo, bar, quux FROM baz WHERE storge = 'grault';
do

    SELECT
       foo
      ,bar
      ,quux
    FROM
      baz
    WHERE
      storge = 'grault'
    ;
It's pretty hideous in this example but for bigger queries maintained over a long period of time it can be beneficial. I assume, it's been nearly 20 years since I did anything more serious with SQL.
KuhaLeyka 11/14/2025||
Don't use it in when you write code for critical infrastructure or aviation please. :)
hamonrye 11/13/2025||
[dead]
ltbarcly3 11/13/2025|
claude "resolve merge conflicts"
littlestymaar 11/13/2025||
Using 30s worth of H100 GPU instead of <10ms worth of an entry-level CPU, for a worse result.

Well done.

ltbarcly3 11/13/2025||
"Compositing text into graphical data to display it on a 2D array of millions of 32bit RGB pixels instead of just using a pencil and a 50 cent notebook."

Actually I've done this a hundred times now and it has yet to make a single mistake. I don't give a crap how much GPU it uses, grandpa.

Cthulhu_ 11/13/2025||
OK, I'm going to try and resolve these merge conflicts for you!

First, let me pull up the diff and git status

......

....

...

.

Hmm, that didn't quite work, let me try that again!

ltbarcly3 11/13/2025||
I've resolved hundreds of conflicted merges this way and I don't remember it making a single mistake.
n4r9 11/13/2025||
Might that be because LLMs are potentially negatively impacting your memory?
ltbarcly3 11/13/2025||
Yea that's probably it. Or you're wrong? One of those for sure.