line-based-diff and very long lines

[low venture]

When your question is answered use !solved to mark the question as resolved.

Remember to ask specific questions, provide necessary details, and reduce your question to its simplest form. For tips on how to ask a good question run !howto ask.

[broken peak]

just get a diffing tool that understands what is being changed on a more precise methode like araxis merge

[patent plaza]

eg "commit 3 doesn't conflict directly with commit 1, but it conflicts with commit 2 which conflicts with commit 1, so commit 3 indirectly depends on commit 1"

[broken peak]

okay instead of doing all of that, why not just keep it simple and not do any of that?

[patent plaza]

cus we may have like, a ton of changes that indirectly depend on other changes

[broken peak]

I would simply start with the absolute simplest solution you can think of

[patent plaza]

eg

edit 0: line 1: hello
edit 1: line 2: world
edit 2: line 1: foo
edit 3: line 3: AFCD

here, we can deduce that edit 3 depends on edit 1 but does not depend on edit 2

we can deduce edit 2 depends on edit 0 but does not depend on edit 1

we can deduce edit 1 depends on edit 0 but does not depend on edit 2 as edit 2 was made after edit 1

[broken peak]

honestly I would simply say, don't worry about it

and just have no dependency tracking