akkartik/sokoban.love - Change PT7ICD7ZAB4IT6K5B4LURL5LUXHSN4ML5YWCG52YFLE2IBNZ53UAC

resolve conflicts

Created by akkartik 2 days ago

PT7ICD7ZAB4IT6K5B4LURL5LUXHSN4ML5YWCG52YFLE2IBNZ53UAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua
BFD:BFD[7.2] → [8.147062:147101]
BFD:BFD[7.2] → [8.147062:147101]
BFD:BFD[8.147101] → [8.83723:83723]
B:BD[8.106000] → [6.154:224]
B:BD[10.22256] → [6.225:295]
∅:D[6.295] → [8.106089:106117]
∅:D[6.224] → [8.106030:106060]
```
  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then
  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
    Text.end_of_line(State)
    Text.start_of_line(State)
```

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[7.2] → [8.165725:165764]

BFD:BFD[8.165764] → [8.152440:152440]

B:BD[11.513] → [5.16:50]

B:BD[10.32463] → [5.51:246]

B:BD[8.159170] → [5.247:278]

B:BD[8.160402] → [5.279:310]

B:BD[8.160516] → [5.311:342]

B:BD[12.142] → [5.343:374]

B:BD[8.160737] → [5.375:406]

B:BD[8.161311] → [5.407:438]

B:BD[8.161829] → [5.439:470]

B:BD[13.7497] → [5.471:502]

B:BD[8.161946] → [5.503:534]

B:BD[8.162224] → [5.535:566]

∅:D[5.566] → [8.162360:162587]

∅:D[5.534] → [14.473:535]

∅:D[5.502] → [8.161858:161908]

∅:D[5.470] → [15.194:233]

∅:D[5.438] → [8.161447:161625]

∅:D[5.406] → [8.160873:161052]

∅:D[5.374] → [8.160659:160737]

∅:D[5.342] → [12.11:142]

∅:D[5.310] → [8.160431:160516]

∅:D[5.278] → [8.159199:159254]

∅:D[5.246] → [14.417:472]

∅:D[5.50] → [10.32160:32463]

  local dm = App.default_modifier
      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then
  elseif chord == dm('f') then
  elseif chord == dm('=') then
  elseif chord == dm('-') then
  elseif chord == dm('0') then
  elseif chord == dm('z') then
  elseif chord == dm('y') then
  elseif chord == dm('a') then
  elseif chord == dm('c') then
  elseif chord == dm('x') then
  elseif chord == dm('v') then
    -- We don't have a good sense of when to scroll, so we'll be conservative
    -- and sometimes scroll when we didn't quite need to.
    local before_line = State.cursor1.line
    local before = snapshot(State, before_line)
    local s = Text.cut_selection_and_record_undo_event(State)
    local s = Text.selection(State)
    if s then
    State.selection1 = {line=1, pos=1}
    local event = redo_event(State)
    if event then
      local src = event.after
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
    local event = undo_event(State)
    if event then
      local src = event.before
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
  -- undo
    if State.font_height > 2 then
      edit.update_font_settings(State, State.font_height-2)
      Text.redraw_all(State)
    end
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
    State.search_term = ''
    State.search_backup = {
    Text.delete_selection_and_record_undo_event(State)
  if State.selection1.line and
      not State.lines.current_drawing and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and

File deletion: source.lua, source.lua

BFD:BFD[7.2] → [8.177652:177686]

BFD:BFD[8.177686] → [8.165766:165766]

B:BD[8.169798] → [5.568:592]

∅:D[5.592] → [17.70:306]

  if OS == 'Linux' then
    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
  else
    App.screen.move(settings.x, settings.y, settings.displayindex)
  end

File deletion: run.lua, run.lua

BFD:BFD[7.2] → [8.184046:184077]

BFD:BFD[8.184077] → [8.178044:178044]

B:BD[18.130] → [5.597:621]

∅:D[5.621] → [18.187:423]

  if OS == 'Linux' then
    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
  else
    App.screen.move(settings.x, settings.y, settings.displayindex)
  end

Replacement in source_text.lua at line 389 [19.83786]
B:BD[19.106063] → [19.106063:106093]
```
  elseif chord == 'home' then
```
[19.106063]
[19.106093]
```
  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then
```
Replacement in source_text.lua at line 392 [19.83786]
∅:D[20.22256] → [19.106123:106152]
B:BD[19.106123] → [19.106123:106152]
```
  elseif chord == 'end' then
```
[20.22256]
[19.106152]
```
  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
```
Insertion in source_edit.lua at line 398 [19.152503]
[16.455]
[20.25356]
```
  local dm = App.default_modifier
```

Replacement in source_edit.lua at line 404 [19.152503]

B:BD[20.25659] → [21.8283:8468]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

[20.25659]

[22.173]

      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then

Replacement in source_edit.lua at line 433 [19.152503]
B:BD[19.159233] → [19.159233:159262]
```
  elseif chord == 'C-f' then
```
[19.159233]
[19.159262]
```
  elseif chord == dm('f') then
```
Replacement in source_edit.lua at line 440 [19.152503]
B:BD[19.160465] → [19.160465:160494]
```
  elseif chord == 'C-=' then
```
[19.160465]
[19.160494]
```
  elseif chord == dm('=') then
```
Replacement in source_edit.lua at line 443 [19.152503]
B:BD[19.160579] → [19.160579:160608]
```
  elseif chord == 'C--' then
```
[19.160579]
[23.9553]
```
  elseif chord == dm('-') then
```
Replacement in source_edit.lua at line 448 [19.152503]
∅:D[23.9684] → [19.160693:160722]
B:BD[19.160693] → [19.160693:160722]
```
  elseif chord == 'C-0' then
```
[23.9684]
[19.160722]
```
  elseif chord == dm('0') then
```
Replacement in source_edit.lua at line 452 [19.152503]
B:BD[19.160800] → [19.160800:160829]
```
  elseif chord == 'C-z' then
```
[19.160800]
[19.160936]
```
  elseif chord == dm('z') then
```
Replacement in source_edit.lua at line 465 [19.152503]
B:BD[19.161374] → [19.161374:161403]
```
  elseif chord == 'C-y' then
```
[19.161374]
[19.161510]
```
  elseif chord == dm('y') then
```
Replacement in source_edit.lua at line 479 [19.152503]
B:BD[19.161892] → [24.165:194]
```
  elseif chord == 'C-a' then
```
[19.161892]
[24.194]
```
  elseif chord == dm('a') then
```
Replacement in source_edit.lua at line 482 [19.152503]
∅:D[24.331] → [19.161892:161921]
∅:D[23.9773] → [19.161892:161921]
B:BD[19.161892] → [19.161892:161921]
```
  elseif chord == 'C-c' then
```
[23.9773]
[19.161921]
```
  elseif chord == dm('c') then
```
Replacement in source_edit.lua at line 487 [19.152503]
B:BD[19.162009] → [19.162009:162038]
```
  elseif chord == 'C-x' then
```
[19.162009]
[22.229]
```
  elseif chord == dm('x') then
```
Replacement in source_edit.lua at line 493 [19.152503]
B:BD[19.162287] → [19.162287:162316]
```
  elseif chord == 'C-v' then
```
[19.162287]
[19.162423]
```
  elseif chord == dm('v') then
```
Replacement in source.lua at line 144 [19.165829]
∅:D[25.425] → [26.125:158]
B:BD[26.125] → [26.125:158]
B:BD[26.158] → [25.426:450]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```
[25.425]
[25.450]
```
  if OS == 'Linux' then
```
Replacement in run.lua at line 71 [19.178107]
B:BD[25.1916] → [25.1916:1973]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```
[25.1916]
[25.1973]
```
  if OS == 'Linux' then
```
Insertion in main.lua at line 82 [28.2]
[27.611]
[19.186281]
```
  OS = love.system.getOS()
```
Deletion in main.lua at line 397 [28.2]
B:BD[29.155] → [16.2741:2741]
B:BD[30.298] → [5.625:653]
BD:BD[30.298] → [5.625:653]
BD:BD[30.298] → [5.625:653]
```
  OS = love.system.getOS()
```
Solving an order conflict in main.lua at line 397 [28.2]
[29.155]
Insertion in edit.lua at line 263 [32.413]
[16.3203]
[31.5508]
```
  local dm = App.default_modifier
```

Replacement in edit.lua at line 268 [32.413]

B:BD[31.5769] → [33.4935:5120]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

[31.5769]

[22.309]

      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then

Replacement in edit.lua at line 297 [32.413]
B:BD[31.6956] → [31.6956:6985]
```
  elseif chord == 'C-f' then
```
[31.6956]
[31.6985]
```
  elseif chord == dm('f') then
```
Replacement in edit.lua at line 304 [32.413]
B:BD[31.7194] → [31.7194:7223]
```
  elseif chord == 'C-=' then
```
[31.7194]
[31.7223]
```
  elseif chord == dm('=') then
```
Replacement in edit.lua at line 307 [32.413]
B:BD[31.7308] → [31.7308:7337]
```
  elseif chord == 'C--' then
```
[31.7308]
[31.7337]
```
  elseif chord == dm('-') then
```
Replacement in edit.lua at line 312 [32.413]
B:BD[31.7468] → [31.7468:7497]
```
  elseif chord == 'C-0' then
```
[31.7468]
[31.7497]
```
  elseif chord == dm('0') then
```
Replacement in edit.lua at line 316 [32.413]
B:BD[31.7575] → [31.7575:7604]
```
  elseif chord == 'C-z' then
```
[31.7575]
[31.7711]
```
  elseif chord == dm('z') then
```
Replacement in edit.lua at line 327 [32.413]
B:BD[31.8198] → [31.8198:8227]
```
  elseif chord == 'C-y' then
```
[31.8198]
[31.8334]
```
  elseif chord == dm('y') then
```
Replacement in edit.lua at line 339 [32.413]
B:BD[31.8765] → [31.8765:8794]
```
  elseif chord == 'C-a' then
```
[31.8765]
[31.8794]
```
  elseif chord == dm('a') then
```
Replacement in edit.lua at line 342 [32.413]
B:BD[31.8921] → [31.8921:8950]
```
  elseif chord == 'C-c' then
```
[31.8921]
[31.8950]
```
  elseif chord == dm('c') then
```
Replacement in edit.lua at line 347 [32.413]
B:BD[31.9035] → [31.9035:9064]
```
  elseif chord == 'C-x' then
```
[31.9035]
[22.365]
```
  elseif chord == dm('x') then
```
Replacement in edit.lua at line 353 [32.413]
B:BD[31.9310] → [31.9310:9339]
```
  elseif chord == 'C-v' then
```
[31.9310]
[31.9446]
```
  elseif chord == dm('v') then
```
Deletion in edit.lua at line 450 [32.413]
B:BD[31.12430] → [3.34:34]
B:BD[34.551] → [5.1484:1515]
BD:BD[34.551] → [5.1484:1515]
B:BD[32.13403] → [5.1452:1483]
BD:BD[32.13403] → [5.1452:1483]
BD:BD[32.13403] → [5.1452:1483]
B:BD[15.657] → [5.1420:1451]
BD:BD[15.657] → [5.1420:1451]
B:BD[32.13212] → [5.1388:1419]
BD:BD[32.13212] → [5.1388:1419]
B:BD[32.12717] → [5.1356:1387]
BD:BD[32.12717] → [5.1356:1387]
B:BD[35.36] → [5.1324:1355]
BD:BD[35.36] → [5.1324:1355]
B:BD[12.289] → [5.1292:1323]
BD:BD[12.289] → [5.1292:1323]
B:BD[36.6814] → [5.1260:1291]
BD:BD[36.6814] → [5.1260:1291]
B:BD[35.25] → [5.1228:1259]
BD:BD[35.25] → [5.1228:1259]
B:BD[32.11758] → [5.1196:1227]
BD:BD[32.11758] → [5.1196:1227]
B:BD[32.10752] → [5.1000:1195]
BD:BD[32.10752] → [5.1000:1195]
BD:BD[32.10752] → [5.1000:1195]
B:BD[11.3715] → [5.965:999]
BD:BD[11.3715] → [5.965:999]
BD:BD[11.3715] → [5.965:999]
```
  elseif chord == dm('v') then
  elseif chord == dm('x') then
  elseif chord == dm('c') then
  elseif chord == dm('a') then
  elseif chord == dm('y') then
  elseif chord == dm('z') then
  elseif chord == dm('0') then
  elseif chord == dm('-') then
  elseif chord == dm('=') then
  elseif chord == dm('f') then
      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then
  local dm = App.default_modifier
```
Solving an order conflict in edit.lua at line 450 [32.413]
[31.12430]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Replacement in source_text.lua at line 389 [19.83786]

Replacement in source_text.lua at line 392 [19.83786]

Insertion in source_edit.lua at line 398 [19.152503]

Replacement in source_edit.lua at line 404 [19.152503]

Replacement in source_edit.lua at line 433 [19.152503]

Replacement in source_edit.lua at line 440 [19.152503]

Replacement in source_edit.lua at line 443 [19.152503]

Replacement in source_edit.lua at line 448 [19.152503]

Replacement in source_edit.lua at line 452 [19.152503]

Replacement in source_edit.lua at line 465 [19.152503]

Replacement in source_edit.lua at line 479 [19.152503]

Replacement in source_edit.lua at line 482 [19.152503]

Replacement in source_edit.lua at line 487 [19.152503]

Replacement in source_edit.lua at line 493 [19.152503]

Replacement in source.lua at line 144 [19.165829]

Replacement in run.lua at line 71 [19.178107]

Insertion in main.lua at line 82 [28.2]

Deletion in main.lua at line 397 [28.2]

Solving an order conflict in main.lua at line 397 [28.2]

Insertion in edit.lua at line 263 [32.413]

Replacement in edit.lua at line 268 [32.413]

Replacement in edit.lua at line 297 [32.413]

Replacement in edit.lua at line 304 [32.413]

Replacement in edit.lua at line 307 [32.413]

Replacement in edit.lua at line 312 [32.413]

Replacement in edit.lua at line 316 [32.413]

Replacement in edit.lua at line 327 [32.413]

Replacement in edit.lua at line 339 [32.413]

Replacement in edit.lua at line 342 [32.413]

Replacement in edit.lua at line 347 [32.413]

Replacement in edit.lua at line 353 [32.413]

Deletion in edit.lua at line 450 [32.413]

Solving an order conflict in edit.lua at line 450 [32.413]