akkartik/sokoban.love - Change FBBHEUQNDHGZQES6GC3VW55DXILRP7PYYXNLQF3HGHKYLUGWAUBQC

Client for playing 300 publicly available Sokoban puzzles on a computer or phone.

resolve conflicts

Created by akkartik on September 1, 2024

FBBHEUQNDHGZQES6GC3VW55DXILRP7PYYXNLQF3HGHKYLUGWAUBQC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua
BFD:BFD[6.2] → [7.147062:147101]
BFD:BFD[6.2] → [7.147062:147101]
BFD:BFD[7.147101] → [7.83723:83723]
B:BD[8.21274] → [4.124:181]
B:BD[8.21417] → [4.182:239]
∅:D[4.239] → [8.21477:21525]
∅:D[4.181] → [8.21334:21382]
```
      Text.delete_selection_and_record_undo_event(State)
      Text.delete_selection_and_record_undo_event(State)
      schedule_save(State)
      return
    end
      schedule_save(State)
      return
    end
```
File deletion: source_edit.lua, source_edit.lua
BFD:BFD[6.2] → [7.165725:165764]
BFD:BFD[6.2] → [7.165725:165764]
BFD:BFD[7.165764] → [7.152440:152440]
B:BD[9.21059] → [3.0:44]
B:BD[10.197] → [4.417:472]
B:BD[7.161975] → [4.473:535]
∅:D[4.535] → [7.162147:162161]
∅:D[4.472] → [8.32655:32661]
∅:D[3.44] → [11.417:461]
```
                       Drawing.before = nil
    Text.delete_selection_and_record_undo_event(State)
    local s = Text.cut_selection_and_record_undo_event(State)
    if s then
  end
                       schedule_save(State)
```

Replacement in source_text.lua at line 251 [13.83786]

B:BD[12.21274] → [12.21274:21334]

      Text.delete_selection(State, State.left, State.right)

[12.21274]

[12.21334]

      Text.delete_selection_and_record_undo_event(State)

Replacement in source_text.lua at line 299 [13.83786]

B:BD[12.21417] → [12.21417:21477]

      Text.delete_selection(State, State.left, State.right)

[12.21417]

[12.21477]

      Text.delete_selection_and_record_undo_event(State)

Insertion in source_edit.lua at line 193 [13.152503]

[14.19609]

[2.320]

                       Drawing.before = nil

Replacement in source_edit.lua at line 395 [13.152503]
∅:D[15.164] → [12.25793:25851]
∅:D[16.179] → [12.25793:25851]
∅:D[17.198] → [12.25793:25851]
∅:D[18.8468] → [12.25793:25851]
B:BD[12.25793] → [12.25793:25851]
```
    Text.delete_selection(State, State.left, State.right)
```
[18.8468]
[12.25851]
```
    Text.delete_selection_and_record_undo_event(State)
```

Replacement in source_edit.lua at line 473 [13.152503]

B:BD[13.162145] → [13.162145:162210]

    local s = Text.cut_selection(State, State.left, State.right)

[13.162038]

[13.162210]

    local s = Text.cut_selection_and_record_undo_event(State)

Replacement in edit.lua at line 267 [21.413]
∅:D[19.5120] → [20.5956:6014]
B:BD[20.5956] → [20.5956:6014]
```
    Text.delete_selection(State, State.left, State.right)
```
[19.5120]
[20.6014]
```
    Text.delete_selection_and_record_undo_event(State)
```

Replacement in edit.lua at line 344 [21.413]

B:BD[20.9171] → [20.9171:9236]

    local s = Text.cut_selection(State, State.left, State.right)

[20.9064]

[20.9236]

    local s = Text.cut_selection_and_record_undo_event(State)

Deletion in edit.lua at line 446 [21.413]
B:BD[20.12430] → [2.538:538]
B:BD[21.13432] → [4.782:844]
BD:BD[21.13432] → [4.782:844]
B:BD[22.185] → [4.726:781]
BD:BD[22.185] → [4.726:781]
BD:BD[22.185] → [4.726:781]
B:BD[23.935] → [3.45:89]
BD:BD[23.935] → [3.45:89]
BD:BD[23.935] → [3.45:89]
```
    local s = Text.cut_selection_and_record_undo_event(State)
    Text.delete_selection_and_record_undo_event(State)
                       Drawing.before = nil
```
Solving an order conflict in edit.lua at line 446 [21.413]
[20.12430]
Deletion in README.md at line 49 [26.6]
B:BD[25.95] → [24.12041:12110]
BD:BD[25.95] → [24.12041:12110]
```
  other ways. Works well in all circumstances with files under 50KB.
```