I’m resolving Git merge conflict with Meld, where I have a big file with hundreds of conflict.
I want to do it gradually, meaning resolving some blocks, save the file, then continue the work after some times.
The problem is, every time I close the file, Meld asks if I want to mark file as resolved, I say “No”, then Meld reverts all the changes I did .
I wonder if there is a way to tell Meld to just save the dirty work, without marking file as resolved?
From memory, Meld will save the changes you’ve made if you save the file. The problem is that unfortunately when you go back in to the file using Meld it will re-merge the file from the two git versions. We definitely should support resuming a partial merge like you want to do, but it’s not something that currently works.
.