akkartik/carousel.love - Change QMRQL2FOIIXU3PCSH7UQIDRLKJN2DQHB5IUL4TLBVANNHWWETL6AC

resolve conflicts

Created by akkartik on December 29, 2023

QMRQL2FOIIXU3PCSH7UQIDRLKJN2DQHB5IUL4TLBVANNHWWETL6AC

Dependencies

In channels

main

Change contents

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[8.19722] → [9.116:133]
B:BD[7.155320] → [9.170:200]
B:BD[7.155405] → [9.201:237]
B:BD[7.163992] → [9.238:294]
B:BD[10.557] → [9.295:326]
B:BD[9.326] → [11.129:139]
∅:D[11.139] → [7.164521:164552]
∅:D[9.326] → [7.164521:164552]
∅:D[9.294] → [7.164065:164115]
∅:D[9.237] → [7.155405:155429]
∅:D[9.200] → [7.155349:155350]
B:BD[9.133] → [5.12:43]
∅:D[5.43] → [7.154835:154866]
∅:D[9.169] → [7.154835:154866]
B:BD[7.152846] → [11.0:128]
∅:D[9.115] → [7.152968:152987]
∅:D[11.128] → [7.152968:152987]
```
    font = font,
end  -- edit.initialize_state
  love.graphics.setFont(State.font)
  State.font = love.graphics.newFont(State.font_height)
      love.graphics.getFont(),
      14,
      15)  -- line height
end
  State.line_height = math.floor(font_height*1.3)
  App.color(Text_color)
    font_height = font_height,
    line_height = line_height,
function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen
  local result = {
```

File deletion: source.lua, source.lua

BFD:BFD[6.2] → [7.177652:177686]

BFD:BFD[7.177686] → [7.165766:165766]

B:BD[7.168468] → [9.327:386]

B:BD[7.170022] → [9.538:588]

B:BD[13.51] → [11.304:482]

∅:D[11.482] → [14.115:151]

∅:D[9.754] → [14.115:151]

∅:D[9.588] → [13.13:51]

B:BD[7.169468] → [5.45:217]

∅:D[5.217] → [7.169599:169643]

∅:D[11.303] → [7.169599:169643]

∅:D[9.537] → [7.169599:169643]

∅:D[9.386] → [15.72:364]

  local font = love.graphics.newFont(settings.font_height)
  local font = love.graphics.newFont(font_height)
  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))
  Editor_state.filename = 'run.lua'
  source.initialize_window_geometry()
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
  Editor_state.filename = settings.filename
  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()
  App.screen.flags.resizable = true
  App.screen.width, App.screen.height = settings.width, settings.height
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)

File deletion: run.lua, run.lua

BFD:BFD[6.2] → [7.184046:184077]

BFD:BFD[7.184077] → [7.178044:178044]

B:BD[7.179375] → [9.755:814]

B:BD[7.180370] → [9.955:1005]

B:BD[13.137] → [11.645:788]

∅:D[11.788] → [7.180749:180782]

∅:D[9.1136] → [7.180749:180782]

∅:D[9.1005] → [13.102:137]

B:BD[17.67] → [11.483:644]

∅:D[11.644] → [7.180163:180297]

∅:D[9.954] → [7.180163:180297]

∅:D[9.814] → [15.1186:1295]

  local font = love.graphics.newFont(Settings.font_height)
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Settings = run.settings()
end
  run.initialize_window_geometry()
  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))
  Editor_state.filename = Settings.filename
  Editor_state.screen_top1 = Settings.screen_top
  Editor_state.cursor1 = Settings.cursor
  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[6.2] → [7.203223:203262]

BFD:BFD[7.203262] → [7.191782:191782]

B:BD[7.192175] → [11.953:1166]

∅:D[11.1166] → [7.192369:192603]

∅:D[9.1324] → [7.192369:192603]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
  Log_browser_state.filename = 'log'
  load_from_disk(Log_browser_state)  -- TODO: pay no attention to Fold
  log_browser.parse(Log_browser_state)
  Text.redraw_all(Log_browser_state)
  Log_browser_state.screen_top1 = {line=1, pos=1}

Replacement in source_edit.lua at line 28 [19.152503]

B:BD[19.152909] → [19.152909:153031]

function edit.initialize_state(top, left, right, font_height, line_height)  -- currently always draws to bottom of screen

[19.152909]

[19.153031]

function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen

Insertion in source_edit.lua at line 88 [19.152503]
[20.18272]
[19.154867]
```
    font = font,
```
Replacement in source_edit.lua at line 109 [19.152503]
B:BD[19.155383] → [19.155383:155412]
```
end  -- App.initialize_state
```
[19.155383]
[19.155412]
```
end  -- edit.initialize_state
```
Insertion in source_edit.lua at line 161 [19.152503]
[19.155468]
[19.155468]
```
  love.graphics.setFont(State.font)
```

Replacement in source_edit.lua at line 557 [19.152503]

B:BD[19.164055] → [21.11:77]

  love.graphics.setFont(love.graphics.newFont(State.font_height))

[19.164055]

[19.164128]

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

Replacement in source_edit.lua at line 574 [19.152503]
∅:D[22.557] → [19.164530:164584]
B:BD[19.164530] → [19.164530:164584]
```
      14,  -- font height assuming default LÖVE font
```
[22.557]
[19.164584]
```
      love.graphics.getFont(),
      14,
```

Replacement in source.lua at line 117 [19.165829]

B:BD[19.168531] → [19.168531:168600]

  love.graphics.setFont(love.graphics.newFont(settings.font_height))

[19.168531]

[23.72]

  local font = love.graphics.newFont(settings.font_height)

Replacement in source.lua at line 129 [19.165829]

B:BD[19.169531] → [24.276:442]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, settings.font_height, math.floor(settings.font_height*1.3))

[19.169531]

[19.169662]

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

Replacement in source.lua at line 155 [19.165829]

B:BD[19.170085] → [19.170085:170145]

  love.graphics.setFont(love.graphics.newFont(font_height))

[19.170085]

[25.13]

  local font = love.graphics.newFont(font_height)

Replacement in source.lua at line 157 [19.165829]

B:BD[25.51] → [24.443:573]

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

[25.51]

[26.2008]

  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))

Deletion in source.lua at line 159 [19.165829]
∅:D[26.2044] → [19.170346:170444]
B:BD[19.170346] → [19.170346:170444]
```
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)
```

Replacement in run.lua at line 57 [19.178107]

B:BD[19.179231] → [19.179231:179300]

  love.graphics.setFont(love.graphics.newFont(Settings.font_height))

[19.179231]

[23.1698]

  local font = love.graphics.newFont(Settings.font_height)

Replacement in run.lua at line 64 [19.178107]

∅:D[27.88] → [19.179864:180019]

∅:D[28.1739] → [19.179864:180019]

∅:D[23.1858] → [19.179864:180019]

B:BD[19.179864] → [19.179864:180019]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, Settings.font_height, math.floor(Settings.font_height*1.3))

[23.1858]

[19.180019]

  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))

Replacement in run.lua at line 82 [19.178107]

B:BD[19.180226] → [19.180226:180286]

  love.graphics.setFont(love.graphics.newFont(font_height))

[19.180226]

[25.102]

  local font = love.graphics.newFont(font_height)

Replacement in run.lua at line 84 [19.178107]

∅:D[25.137] → [19.180389:180582]

∅:D[29.1589] → [19.180389:180582]

B:BD[19.180389] → [19.180389:180582]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)

[25.137]

[19.180605]

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

Replacement in reference.md at line 193 [31.17]

B:BD[30.245] → [3.17:93]

BD:BD[30.245] → [3.17:93]

  returns an object that can be used to render an interactive editor widget

[30.164]

[33.17]

* `state = edit.initialize_state(top, left, right, font, font_height, line_height)`
  -- returns an object that can be used to render an interactive editor widget

Deletion in reference.md at line 421 [31.17]

B:BD[30.164] → [11.789:952]

BD:BD[30.164] → [11.789:952]

* `state = edit.initialize_state(top, left, right, font, font_height, line_height)`
  -- returns an object that can be used to render an interactive editor widget

Solving an order conflict in reference.md at line 421 [31.17]
[2.1123]

Replacement in log_browser.lua at line 9 [19.191243]

B:BD[19.191636] → [19.191636:191830]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font_height, Editor_state.line_height)

[19.191636]

[19.191830]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)

Resurrecting zombie bytes in edit.lua at line 50 [34.413]
B:B[34.3321] → [9.1441:1458]
BD:B[34.3321] → [9.1441:1458]
B:B[9.1458] → [11.1296:1327]
BD:B[9.1458] → [11.1296:1327]
```
    font = font,
    font_height = font_height,
```
Insertion in edit.lua at line 103 [34.413]
[36.84]
[36.84]
```
  love.graphics.setFont(State.font)
```

Replacement in edit.lua at line 389 [34.413]

B:BD[36.10509] → [36.10509:10575]

  love.graphics.setFont(love.graphics.newFont(State.font_height))

[36.10509]

[36.10575]

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

Replacement in edit.lua at line 406 [34.413]

B:BD[36.11061] → [36.11061:11115]

      14,  -- font height assuming default LÖVE font

[36.11061]

[36.11115]

      love.graphics.getFont(),
      14,

Deletion in edit.lua at line 456 [34.413]
B:BD[36.12430] → [4.129:129]
B:BD[10.1119] → [9.1620:1651]
BD:BD[10.1119] → [9.1620:1651]
B:BD[37.264] → [9.1563:1619]
BD:BD[37.264] → [9.1563:1619]
B:BD[38.44] → [9.1526:1562]
BD:BD[38.44] → [9.1526:1562]
BD:BD[38.44] → [9.1526:1562]
B:BD[9.1651] → [11.1328:1338]
BD:BD[9.1651] → [11.1328:1338]
```
      love.graphics.getFont(),
  State.font = love.graphics.newFont(State.font_height)
  love.graphics.setFont(State.font)
      14,
```
Solving an order conflict in edit.lua at line 456 [34.413]
[36.12430]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

Replacement in source_edit.lua at line 28 [19.152503]

Insertion in source_edit.lua at line 88 [19.152503]

Replacement in source_edit.lua at line 109 [19.152503]

Insertion in source_edit.lua at line 161 [19.152503]

Replacement in source_edit.lua at line 557 [19.152503]

Replacement in source_edit.lua at line 574 [19.152503]

Replacement in source.lua at line 117 [19.165829]

Replacement in source.lua at line 129 [19.165829]

Replacement in source.lua at line 155 [19.165829]

Replacement in source.lua at line 157 [19.165829]

Deletion in source.lua at line 159 [19.165829]

Replacement in run.lua at line 57 [19.178107]

Replacement in run.lua at line 64 [19.178107]

Replacement in run.lua at line 82 [19.178107]

Replacement in run.lua at line 84 [19.178107]

Replacement in reference.md at line 193 [31.17]

Deletion in reference.md at line 421 [31.17]

Solving an order conflict in reference.md at line 421 [31.17]

Replacement in log_browser.lua at line 9 [19.191243]

Resurrecting zombie bytes in edit.lua at line 50 [34.413]

Insertion in edit.lua at line 103 [34.413]

Replacement in edit.lua at line 389 [34.413]

Replacement in edit.lua at line 406 [34.413]

Deletion in edit.lua at line 456 [34.413]

Solving an order conflict in edit.lua at line 456 [34.413]