Re:What comes after Git
by nine_k on Tuesday July 05, 2022 @01:45AM
(#31984752)
> Difftastic output is intended for human consumption, and it does not generate patches that you can apply later.
To me this looks like integrating it with tools of actual conflict resolution during merges will be a bit harder than one would like. I'd be glad to be wrong.
To me this looks like integrating it with tools of actual conflict resolution during merges will be a bit harder than one would like. I'd be glad to be wrong.