akkartik/etch.love - Change R6OX7LWBKLZ442BGOCWGWWWDV64AFNCPA2HCQKGRTCJHG6PUHVUAC

resolve conflicts

Created by akkartik on May 6, 2025

R6OX7LWBKLZ442BGOCWGWWWDV64AFNCPA2HCQKGRTCJHG6PUHVUAC

Dependencies

In channels

main

Change contents

Deletion in run.lua at line 221 [7.178044]
∅:D[4.89] → [6.3213:3265]
B:BD[6.3213] → [6.3213:3265]
B:BD[6.3265] → [4.91:91]
```
  edit.mouse_press(Editor_state, x,y, mouse_button)
```
Resurrecting zombie bytes in run.lua at line 221 [7.178044]
B:B[8.73] → [9.1646:1724]
BD:B[8.73] → [9.1646:1724]
```
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in run.lua at line 221 [7.178044]
[4.89]
[9.1646]
Deletion in run.lua at line 226 [7.178044]
B:BD[7.183312] → [10.1214:1257]
BD:BD[7.183312] → [10.1214:1257]
B:BD[10.1257] → [5.17:17]
BD:BD[10.1257] → [5.17:17]
BD:BD[10.1257] → [5.17:17]
∅:D[5.17] → [9.1791:1871]
B:BD[7.183312] → [9.1791:1871]
BD:BD[7.183312] → [9.1791:1871]
```
  if File_select_bar_value then return end
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
```

Replacement in run.lua at line 227 [7.178044]

B:BD[6.3309] → [6.3309:3363]

  edit.mouse_release(Editor_state, x,y, mouse_button)

[6.3309]

[7.183520]

  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)

Deletion in run.lua at line 232 [7.178044]
B:BD[7.183641] → [10.1392:1424]
BD:BD[7.183641] → [10.1392:1424]
```
  if File_select_bar_value then
```
Deletion in run.lua at line 241 [7.178044]
B:BD[10.1454] → [10.1454:1488]
BD:BD[10.1454] → [10.1454:1488]
```
      File_select_bar_value = nil
```
Deletion in run.lua at line 243 [7.178044]
B:BD[10.1555] → [10.1555:1637]
BD:BD[10.1555] → [10.1555:1637]
```
      run.switch_to_file(File_select_bar_value)
      File_select_bar_value = nil
```

Deletion in run.lua at line 253 [7.178044]

B:BD[10.1707] → [10.1707:1905]

BD:BD[10.1707] → [10.1707:1905]

      local len = utf8.len(File_select_bar_value)
      local byte_offset = Text.offset(File_select_bar_value, len)
      File_select_bar_value = string.sub(File_select_bar_value, 1, byte_offset-1)

Deletion in run.lua at line 257 [7.178044]
B:BD[10.1946] → [10.1946:2017]
BD:BD[10.1946] → [10.1946:2017]
```
    return
  elseif chord == 'C-w' then
    File_select_bar_value = ''
```

Replacement in run.lua at line 258 [7.178044]

B:BD[6.4736] → [6.4736:4786]

    edit.keychord_press(Editor_state, chord, key)

[6.4736]

[2.15]

    edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)

Deletion in run.lua at line 272 [7.178044]
B:BD[10.2054] → [5.19:19]
∅:D[5.19] → [9.1934:2010]
B:BD[7.183641] → [9.1934:2010]
```
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
```
Deletion in run.lua at line 293 [7.178044]
B:BD[7.184045] → [3.17:17]
B:BD[7.183125] → [10.1170:1213]
BD:BD[7.183125] → [10.1170:1213]
```
  if File_select_bar_value then return end
```
Solving an order conflict in run.lua at line 293 [7.178044]
[7.184045]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in run.lua at line 221 [7.178044]

Resurrecting zombie bytes in run.lua at line 221 [7.178044]

Solving an order conflict in run.lua at line 221 [7.178044]

Deletion in run.lua at line 226 [7.178044]

Replacement in run.lua at line 227 [7.178044]

Deletion in run.lua at line 232 [7.178044]

Deletion in run.lua at line 241 [7.178044]

Deletion in run.lua at line 243 [7.178044]

Deletion in run.lua at line 253 [7.178044]

Deletion in run.lua at line 257 [7.178044]

Replacement in run.lua at line 258 [7.178044]

Deletion in run.lua at line 272 [7.178044]

Deletion in run.lua at line 293 [7.178044]

Solving an order conflict in run.lua at line 293 [7.178044]