4 ms·
Interesting. Wonder if something like that can be used to make git cleverer about merges for example.
by grotorea 3y ago
Interesting. Wonder if something like that can be used to make git cleverer about merges for example.
- fanf2 3y agoGit’s merge algorithm looks at three versions of the code: the two branch tips being merged, and their common ancestor. It might be better at resolving conflicts if it looked at some of the intermediate commits as well, but I don’t know of anything that does so.
- deleted 3y ago[deleted]
- ilyt 3y agoMerge part isn't pluggable like that IIRC. Would be interesting if that was given stable interface, then supposed "smart merge" tool could iterate with few ways to merge code while running tests to check which one produces least/no errors