akkartik/etch.love - Change IZ2ORLNABWH7J3HL4MXHCAU5L6JMBCKQYBOSLHHWBBIQAWNBISSQC

resolve conflicts

Created by akkartik on May 6, 2025

IZ2ORLNABWH7J3HL4MXHCAU5L6JMBCKQYBOSLHHWBBIQAWNBISSQC

Dependencies

In channels

main

Change contents

Deletion in source.lua at line 145 [7.165766]
B:BD[7.171215] → [6.698:726]
BD:BD[7.171215] → [6.698:726]
```
function source.resize(w,h)
```
Deletion in run.lua at line 82 [7.178044]
B:BD[7.181355] → [6.1556:1581]
BD:BD[7.181355] → [6.1556:1581]
```
function run.resize(w,h)
```
Resurrecting zombie bytes in run.lua at line 155 [7.178044]
B:B[7.183125] → [8.1170:1213]
BD:B[7.183125] → [8.1170:1213]
```
  if File_select_bar_value then return end
```
Resurrecting zombie bytes in run.lua at line 162 [7.178044]
B:B[7.183312] → [8.1214:1257]
BD:B[7.183312] → [8.1214:1257]
```
  if File_select_bar_value then return end
```
Solving an order conflict in run.lua at line 163 [7.178044]
[8.1257]
[6.1791]

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

B:B[7.183641] → [8.1392:1488]

BD:B[7.183641] → [8.1392:1488]

B:B[8.1521] → [8.1521:1637]

BD:B[8.1521] → [8.1521:1637]

B:B[8.1670] → [8.1670:1905]

BD:B[8.1670] → [8.1670:1905]

B:B[8.1938] → [8.1938:2017]

BD:B[8.1938] → [8.1938:2017]

B:B[8.2048] → [8.2048:2054]

BD:B[8.2048] → [8.2048:2054]

  if File_select_bar_value then
    if chord == 'escape' then
      File_select_bar_value = nil
    elseif chord == 'return' then
      run.switch_to_file(File_select_bar_value)
      File_select_bar_value = nil
    elseif chord == 'backspace' then
      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)
    end
    return
  elseif chord == 'C-w' then
    File_select_bar_value = ''
  end

Solving an order conflict in run.lua at line 192 [7.178044]
[8.2054]
[6.1934]
Resurrecting zombie bytes in main.lua at line 125 [10.2]
∅:∅[6.2141] → [9.283:322]
B:B[7.187263] → [9.283:322]
BD:B[7.187263] → [9.283:322]
```
  elseif current_app_is_warning() then
```
Resurrecting zombie bytes in main.lua at line 168 [10.2]
B:B[11.8] → [6.2142:2203]
BD:B[11.8] → [6.2142:2203]
```
function App.keychord_press(chord, key, scancode, is_repeat)
```

Insertion in main.lua at line 257 [10.2]

[7.191121]

[13.291]

    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end

Deletion in main.lua at line 263 [10.2]

B:BD[7.191121] → [6.2788:2884]

BD:BD[7.191121] → [6.2788:2884]

B:BD[15.143] → [6.2885:2953]

BD:BD[15.143] → [6.2885:2953]

B:BD[15.234] → [6.2954:3028]

BD:BD[15.234] → [6.2954:3028]

    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end
    if run.mouse_move then run.mouse_move(x,y, dx,dy, is_touch) end
    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end

Solving an order conflict in main.lua at line 263 [10.2]
[13.362]
[7.191261]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in source.lua at line 145 [7.165766]

Deletion in run.lua at line 82 [7.178044]

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

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

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

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

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

Resurrecting zombie bytes in main.lua at line 125 [10.2]

Resurrecting zombie bytes in main.lua at line 168 [10.2]

Insertion in main.lua at line 257 [10.2]

Deletion in main.lua at line 263 [10.2]

Solving an order conflict in main.lua at line 263 [10.2]