akkartik/sokoban.love - Change EWWIFR6PRJFDRO2D2DES5GEPQO5RZZECRHNCUJE45KO27VK6Q4FQC

resolve conflicts

Created by akkartik on February 4, 2024

EWWIFR6PRJFDRO2D2DES5GEPQO5RZZECRHNCUJE45KO27VK6Q4FQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text_tests.lua at line 62 [5.2]
B:B[4.2805] → [2.80:118]
BD:B[4.2805] → [2.80:118]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 63 [5.2]
B:B[6.150] → [3.189:245]
BD:B[6.150] → [3.189:245]
```
  edit.run_after_keychord(Editor_state, 'left', 'left')
```
Solving an order conflict in text_tests.lua at line 63 [5.2]
[2.118]
[3.189]
Resurrecting zombie bytes in text_tests.lua at line 73 [5.2]
B:B[4.3035] → [2.119:157]
BD:B[4.3035] → [2.119:157]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 74 [5.2]
B:B[6.177] → [3.246:304]
BD:B[6.177] → [3.246:304]
```
  edit.run_after_keychord(Editor_state, 'right', 'right')
```
Solving an order conflict in text_tests.lua at line 74 [5.2]
[2.157]
[3.246]
Resurrecting zombie bytes in text_tests.lua at line 84 [5.2]
B:B[4.3275] → [2.158:196]
BD:B[4.3275] → [2.158:196]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 85 [5.2]
B:B[6.204] → [3.305:361]
BD:B[6.204] → [3.305:361]
```
  edit.run_after_keychord(Editor_state, 'left', 'left')
```
Solving an order conflict in text_tests.lua at line 85 [5.2]
[2.196]
[3.305]
Resurrecting zombie bytes in text_tests.lua at line 96 [5.2]
B:B[4.3662] → [2.197:235]
BD:B[4.3662] → [2.197:235]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 97 [5.2]
B:B[6.231] → [3.362:420]
BD:B[6.231] → [3.362:420]
```
  edit.run_after_keychord(Editor_state, 'right', 'right')
```
Solving an order conflict in text_tests.lua at line 97 [5.2]
[2.235]
[3.362]
Resurrecting zombie bytes in text_tests.lua at line 108 [5.2]
B:B[4.3994] → [2.236:274]
BD:B[4.3994] → [2.236:274]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 109 [5.2]
B:B[6.258] → [3.421:479]
BD:B[6.258] → [3.421:479]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 109 [5.2]
[2.274]
[3.421]
Resurrecting zombie bytes in text_tests.lua at line 119 [5.2]
B:B[4.4273] → [2.275:313]
BD:B[4.4273] → [2.275:313]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 120 [5.2]
B:B[6.285] → [3.480:538]
BD:B[6.285] → [3.480:538]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 120 [5.2]
[2.313]
[3.480]
Resurrecting zombie bytes in text_tests.lua at line 130 [5.2]
B:B[4.4562] → [2.314:352]
BD:B[4.4562] → [2.314:352]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 131 [5.2]
B:B[6.312] → [3.539:597]
BD:B[6.312] → [3.539:597]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 131 [5.2]
[2.352]
[3.539]
Resurrecting zombie bytes in text_tests.lua at line 141 [5.2]
B:B[4.4838] → [2.353:391]
BD:B[4.4838] → [2.353:391]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 142 [5.2]
B:B[6.339] → [3.598:656]
BD:B[6.339] → [3.598:656]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 142 [5.2]
[2.391]
[3.598]
Resurrecting zombie bytes in text_tests.lua at line 152 [5.2]
B:B[4.5128] → [2.392:430]
BD:B[4.5128] → [2.392:430]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 153 [5.2]
B:B[6.366] → [3.657:715]
BD:B[6.366] → [3.657:715]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 153 [5.2]
[2.430]
[3.657]
Resurrecting zombie bytes in text_tests.lua at line 163 [5.2]
B:B[4.5399] → [2.431:469]
BD:B[4.5399] → [2.431:469]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 164 [5.2]
B:B[6.393] → [3.716:774]
BD:B[6.393] → [3.716:774]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Solving an order conflict in text_tests.lua at line 164 [5.2]
[2.469]
[3.716]
Resurrecting zombie bytes in text_tests.lua at line 175 [5.2]
B:B[4.5765] → [2.470:508]
BD:B[4.5765] → [2.470:508]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 176 [5.2]
B:B[6.420] → [3.775:835]
BD:B[6.420] → [3.775:835]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Solving an order conflict in text_tests.lua at line 176 [5.2]
[2.508]
[3.775]
Resurrecting zombie bytes in text_tests.lua at line 186 [5.2]
B:B[4.6044] → [2.509:547]
BD:B[4.6044] → [2.509:547]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 187 [5.2]
B:B[6.447] → [3.836:896]
BD:B[6.447] → [3.836:896]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Solving an order conflict in text_tests.lua at line 187 [5.2]
[2.547]
[3.836]
Resurrecting zombie bytes in text_tests.lua at line 197 [5.2]
B:B[4.6320] → [2.548:586]
BD:B[4.6320] → [2.548:586]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 198 [5.2]
B:B[6.474] → [3.897:957]
BD:B[6.474] → [3.897:957]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Solving an order conflict in text_tests.lua at line 198 [5.2]
[2.586]
[3.897]
Resurrecting zombie bytes in text_tests.lua at line 208 [5.2]
B:B[4.6606] → [2.587:625]
BD:B[4.6606] → [2.587:625]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 209 [5.2]
B:B[6.501] → [3.958:1018]
BD:B[6.501] → [3.958:1018]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Solving an order conflict in text_tests.lua at line 209 [5.2]
[2.625]
[3.958]
Resurrecting zombie bytes in text_tests.lua at line 219 [5.2]
B:B[4.6873] → [2.626:664]
BD:B[4.6873] → [2.626:664]
```
  edit.draw(Editor_state, Text_color)
```
Resurrecting zombie bytes in text_tests.lua at line 220 [5.2]
B:B[6.528] → [3.1019:1079]
BD:B[6.528] → [3.1019:1079]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Solving an order conflict in text_tests.lua at line 220 [5.2]
[2.664]
[3.1019]

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text_tests.lua at line 62 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 63 [5.2]

Solving an order conflict in text_tests.lua at line 63 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 73 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 74 [5.2]

Solving an order conflict in text_tests.lua at line 74 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 84 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 85 [5.2]

Solving an order conflict in text_tests.lua at line 85 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 96 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 97 [5.2]

Solving an order conflict in text_tests.lua at line 97 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 108 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 109 [5.2]

Solving an order conflict in text_tests.lua at line 109 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 119 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 120 [5.2]

Solving an order conflict in text_tests.lua at line 120 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 130 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 131 [5.2]

Solving an order conflict in text_tests.lua at line 131 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 141 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 142 [5.2]

Solving an order conflict in text_tests.lua at line 142 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 152 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 153 [5.2]

Solving an order conflict in text_tests.lua at line 153 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 163 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 164 [5.2]

Solving an order conflict in text_tests.lua at line 164 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 175 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 176 [5.2]

Solving an order conflict in text_tests.lua at line 176 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 186 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 187 [5.2]

Solving an order conflict in text_tests.lua at line 187 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 197 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 198 [5.2]

Solving an order conflict in text_tests.lua at line 198 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 208 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 209 [5.2]

Solving an order conflict in text_tests.lua at line 209 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 219 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 220 [5.2]

Solving an order conflict in text_tests.lua at line 220 [5.2]