akkartik/sokoban.love - Change KFEUQWHXY4OG7GJZWNQPNZWJKEOE5LD4HE2IBCVCV5EEC7DGK26AC

resolve conflicts

Created by akkartik on January 22, 2025

KFEUQWHXY4OG7GJZWNQPNZWJKEOE5LD4HE2IBCVCV5EEC7DGK26AC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[4.2] → [5.165725:165764]

BFD:BFD[5.165764] → [5.152440:152440]

B:BD[6.1030] → [3.12:135]

B:BD[6.1079] → [3.136:266]

∅:D[3.266] → [7.321:327]

∅:D[3.135] → [6.1061:1079]

  if State.lines[line].mode == 'text' then return end
  while line <= #State.lines and State.lines[line].mode ~= 'text' do
  end
  if line <= #State.lines and State.lines[line].mode == 'text' then
    State.cursor1.line = line
    State.cursor1.pos = 1
  end
    line = line+1

Replacement in source_edit.lua at line 146 [9.152503]

B:BD[8.1035] → [8.1035:1066]

  while line < #State.lines do

[8.1035]

[8.1066]

  if State.lines[line].mode == 'text' then return end
  while line <= #State.lines and State.lines[line].mode ~= 'text' do

Replacement in source_edit.lua at line 149 [9.152503]

B:BD[8.1389] → [8.1389:1494]

∅:D[8.1494] → [10.642:662]

B:BD[10.642] → [10.642:662]

    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      break
    end

[8.1084]

[11.18427]

  end
  if line <= #State.lines and State.lines[line].mode == 'text' then
    State.cursor1.line = line
    State.cursor1.pos = 1

Deletion in edit.lua at line 447 [13.413]

B:BD[12.12430] → [2.84:84]

B:BD[6.2150] → [3.408:538]

BD:BD[6.2150] → [3.408:538]

B:BD[6.2101] → [3.284:407]

BD:BD[6.2101] → [3.284:407]

  end
  if line <= #State.lines and State.lines[line].mode == 'text' then
    State.cursor1.line = line
    State.cursor1.pos = 1
  if State.lines[line].mode == 'text' then return end
  while line <= #State.lines and State.lines[line].mode ~= 'text' do

Solving an order conflict in edit.lua at line 447 [13.413]
[12.12430]