Refactor & simplify merging logic #3

Merged

schmelczer merged 15 commits from asch/simplify into main 2025-06-22 15:07:04 +01:00

Conversation 0 Commits 15 Files changed 16 +477 -694

2025-06-22

Andras Schmelczer

Add test

f9ac4d1a2d

• View at this point in history

2025-06-22 15:04:24 +01:00

Andras Schmelczer

Fix lints

9af06183e7

• View at this point in history

2025-06-22 15:02:50 +01:00

Andras Schmelczer

Lint

df6ec254ca

• View at this point in history

2025-06-22 14:58:38 +01:00

Andras Schmelczer

Remove OrderedOperation

a070872bd3

• View at this point in history

2025-06-22 14:53:45 +01:00

Andras Schmelczer

Fix cursors

5759b6bf66

• View at this point in history

2025-06-22 13:06:36 +01:00

Andras Schmelczer

Works without indexes

f95bd43240

• View at this point in history

2025-06-22 12:02:18 +01:00

Andras Schmelczer

Remove indexes from Operation

917d47fbaa

• View at this point in history

2025-06-22 09:50:37 +01:00

Andras Schmelczer

Remove merge context

a4f1a496bd

• View at this point in history

2025-06-22 09:48:56 +01:00

Andras Schmelczer

Remove start_index from sorting

46d2e0c485

• View at this point in history

2025-06-22 09:48:26 +01:00

Andras Schmelczer

DOn't use start_index in EditedText

d58b474669

• View at this point in history

2025-06-22 09:24:36 +01:00

2025-06-21

Andras Schmelczer

Fix with new string builder

2089cbc7aa

• View at this point in history

2025-06-21 13:58:06 +01:00

Andras Schmelczer

Sort deletes first

7589e1bf2e

• View at this point in history

2025-06-21 13:18:13 +01:00

Andras Schmelczer

Remove indices from string builder

5afb2c21f8

• View at this point in history

2025-06-21 13:18:02 +01:00

Andras Schmelczer

Format

1e974c4c9a

• View at this point in history

2025-06-21 10:52:45 +01:00

Andras Schmelczer

Remove a few index uses

351caf74b5

• View at this point in history

2025-06-21 10:50:35 +01:00