akkartik/etch.love - Change KMK6BAPGYMHMJ4XVDCHYJHRACP4NDCIQKHMDIKOCKSAO3H4CNLTAC

resolve conflicts

Created by akkartik on December 29, 2023

KMK6BAPGYMHMJ4XVDCHYJHRACP4NDCIQKHMDIKOCKSAO3H4CNLTAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in source.lua at line 120 [5.165766]
B:B[5.168468] → [6.327:386]
BD:B[5.168468] → [6.327:386]
```
  local font = love.graphics.newFont(settings.font_height)
```
Resurrecting zombie bytes in source.lua at line 142 [5.165766]
B:B[5.170022] → [6.538:588]
BD:B[5.170022] → [6.538:588]
```
  local font = love.graphics.newFont(font_height)
```

Resurrecting zombie bytes in source.lua at line 143 [5.165766]

B:B[9.51] → [10.443:573]

BD:B[9.51] → [10.443:573]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right)

Deletion in source.lua at line 144 [5.165766]

B:BD[9.51] → [4.304:482]

BD:BD[9.51] → [4.304:482]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

Solving an order conflict in source.lua at line 144 [5.165766]
[10.573]
[11.115]

Deletion in run.lua at line 67 [5.178044]

∅:D[12.97] → [13.162:222]

B:BD[13.162] → [13.162:222]

B:BD[5.179375] → [6.755:814]

BD:BD[5.179375] → [6.755:814]

B:BD[14.386] → [15.16:142]

B:BD[15.142] → [7.17:17]

B:BD[16.67] → [4.483:644]

BD:BD[16.67] → [4.483:644]

  love.graphics.setFont(love.graphics.newFont(Font_height))
  local font = love.graphics.newFont(Settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right, Font_height, Line_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))

Solving an order conflict in run.lua at line 67 [5.178044]
[13.162]

Insertion in run.lua at line 67 [5.178044]

[0.19]

[5.180163]

  local font = love.graphics.newFont(Font_height)
  Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)

Deletion in run.lua at line 77 [5.178044]
∅:D[12.265] → [13.408:468]
B:BD[13.408] → [13.408:468]
B:BD[5.180533] → [15.143:243]
B:BD[15.243] → [2.16:16]
B:BD[5.180370] → [6.955:1005]
BD:BD[5.180370] → [6.955:1005]
BD:BD[5.180370] → [6.955:1005]
∅:D[2.16] → [13.469:551]
∅:D[15.243] → [13.469:551]
B:BD[15.243] → [13.469:551]
B:BD[5.180628] → [13.469:551]
BD:BD[5.180628] → [13.469:551]
B:BD[9.137] → [4.645:788]
BD:BD[9.137] → [4.645:788]
```
  love.graphics.setFont(love.graphics.newFont(Font_height))
  Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right)
  local font = love.graphics.newFont(font_height)
  Editor_state.font_height = Font_height
  Editor_state.line_height = Line_height
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
```
Solving an order conflict in run.lua at line 77 [5.178044]
[13.408]

Insertion in run.lua at line 77 [5.178044]

[0.204]

[5.180749]

  local font = love.graphics.newFont(Font_height)
  Editor_state = edit.initialize_state(Margin_top, 45 + Margin_left, App.screen.width-Margin_right, font, Font_height, Line_height)

Resurrecting zombie bytes in edit.lua at line 159 [18.413]
B:B[17.44] → [6.1526:1562]
BD:B[17.44] → [6.1526:1562]
```
  love.graphics.setFont(State.font)
```

Replacement in edit.lua at line 538 [18.413]

B:BD[13.668] → [13.668:728]

  love.graphics.setFont(love.graphics.newFont(Font_height))

[13.668]

[13.728]

  State.font = love.graphics.newFont(Font_height)

Deletion in edit.lua at line 540 [18.413]
B:BD[19.264] → [6.1563:1619]
BD:BD[19.264] → [6.1563:1619]
```
  State.font = love.graphics.newFont(State.font_height)
```
Solving an order conflict in edit.lua at line 540 [18.413]
[13.762]
[19.442]

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in source.lua at line 120 [5.165766]

Resurrecting zombie bytes in source.lua at line 142 [5.165766]

Resurrecting zombie bytes in source.lua at line 143 [5.165766]

Deletion in source.lua at line 144 [5.165766]

Solving an order conflict in source.lua at line 144 [5.165766]

Deletion in run.lua at line 67 [5.178044]

Solving an order conflict in run.lua at line 67 [5.178044]

Insertion in run.lua at line 67 [5.178044]

Deletion in run.lua at line 77 [5.178044]

Solving an order conflict in run.lua at line 77 [5.178044]

Insertion in run.lua at line 77 [5.178044]

Resurrecting zombie bytes in edit.lua at line 159 [18.413]

Replacement in edit.lua at line 538 [18.413]

Deletion in edit.lua at line 540 [18.413]

Solving an order conflict in edit.lua at line 540 [18.413]