logoalt Hacker News

BobbyTables2 • today at 3:03 AM • 3 replies • view on HN

For me the biggest issue is “git rebase” merge conflicts because the surrounding context was modified (especially near beginning/end of functions where the context includes unrelated stuff), or similar in a markdown document.

(If commit A adds a line to the end of a bullet list in markdown and commit B does the same, they will conflict even though resolution is trivial for a human)


Replies

XYen0n • today at 9:01 AM

You could try https://mergiraf.org/

eviks • today at 8:45 AM

That would also be trivial for a syntax-tree-based tool, right?

zem • today at 4:50 AM

the resolution depends on a deeper understanding of the contents of the list and whether they are ordered according to some scheme (in which case you will need to look at the two lines and see which one goes first)