4 ms·
I found it a bit frustrating that merge tools I used were never able to solve trivial merge conflicts automatically. So I built something myself: https://fdietz
by manx 4y ago
I found it a bit frustrating that merge tools I used were never able to solve trivial merge conflicts automatically. So I built something myself: https://fdietze.github.io/blend https://fdietze.github.io/blend
On that page you can paste your merge conflict and copy the automatically merged result, along with some useful diffs. I hope it helps someone else. So far it solves around 80% of my conflicts automatically.
- niedzielski 4y agoThis is what I use in my ~/.gitconfig: [difftool "meld"] cmd = meld "$LOCAL" "$REMOTE" [mergetool "meld"] cmd = meld --auto-merge --output "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
- manx 4y agoAs far as I understand, this only resolves conflicts, git can already resolve with it's line-based approach. I'm talking about conflicts within a single line, that a line based approach cannot solve.
- niedzielski 4y agoThanks! I wasn't understanding that before.