resolve conflicts

akkartik

Jan 22, 2025, 11:59 PM

P6NKDBXEV6PMAULOELKZ6JD3GPPIHW6MF2UTGVDQ74CZBJEOY5YQC

Dependencies

[2] DKL7KWKO resolve conflict
[3] KFEUQWHX resolve conflicts
[4] SGMA5JLE save the list of tests in repo
[5] 2L5MEZV3 experiment: new edit namespace
[6] RSZD5A7G forgot to add json.lua
[7] 3QNOKBFM beginnings of a test harness
[8] CE4LZV4T drop last couple of manual tests
[9] R6MNUXDJ pijul bug
[10] SLMSBVJW resolve conflicts
[11] KKMFQDR4 editing source code from within the app
[12] VXRYVZ74 Merge text.love
[13] 6LJZN727 handle chords
[14] ORKN6EOB Merge lines.love
[15] QXXISTGE resolve conflicts
[16] OGUV4HSA remove some memory leaks from rendered fragments
[17] JOPVPUSA editing source code from within the app
[18] SYWQBIO5 resolve conflicts
[19] 4Y2QDDAZ resolve conflicts
[20] PJ5PQAQE record support for multiple versions
[21] QSHQIVF3 resolve conflicts
[22] FS2ITYYH record a known issue
[23] 66X36NZN a little more prose describing manual_tests
[24] 34BZ5ZKN Merge lines.love
[25] 4SR3Z4Y3 document the version of LÖVE I've been using
[26] S7CSVBHZ resolve conflicts
[27] TLOAPLBJ add a license
[28] 2CTN2IEF Merge lines.love
[29] BLWAYPKV extract a module
[30] OTIBCAUJ love2d scaffold
[31] 2CFLXLIE Merge text.love
[32] CAG7PP5Y Merge text.love
[33] R5QXEHUI somebody stop me
[34] KKQKPGCI resolve conflicts
[35] 36Z442IV back to commit 8123959e52f without code editing
[36] RXMHAZ6V resolve conflicts
[37] LXTTOB33 extract a couple of files
[38] CZ6X73VY merge bugfix
[39] VHUNJHXB Merge lines.love
[40] M5JXTW56 Merge text.love
[41] K2X6G75Z start writing some tests for drawings
[42] 3PSFWAIL Merge lines.love
[43] TVCPXAAU rename
[44] N2NUGNN4 include a brief reference enabling many useful apps
[45] ZLJYLPOT Merge lines.love
[46] VP5KC4XZ Merge lines.love
[47] OTYGZVPW Merge text.love
[48] I4S4EFYX Merge lines.love
[49] VHQCNMAR several more modules
[50] FHZ5AG3M resolve conflicts
[51] VXORMHME delete experimental REPL
[52] D2GCFTTT clean up repl functionality
[53] R56CKHYZ Merge text.love
[54] AVTNUQYR basic test-enabled framework
[55] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[56] ED4Z6ORC cleaner API for file-system access
[57] KJLZCK2R resolve conflicts
[58] BULPIBEG beginnings of a module for the text editor
[59] TOXPJJYY resolve conflicts
[60] KQ22RW43 resolve conflicts
[61] TBTRYEBP Merge lines.love
[62] QIR3VBYI resolve conflicts
[63] MBAJPTDJ resolve conflicts
[64] XX7G2FFJ intermingle freehand line drawings with text
[65] 65WSX5RJ resolve conflicts
[66] VBU5YHLR Merge lines.love
[67] T4FRZSYL delete an ancient, unused file
[68] 6VJTQKW7 start supporting LÖVE v12
[69] 73OCE2MC after much struggle, a brute-force undo
[70] VLTU33KW resolve conflicts
[71] KMSL74GA support selections in the source editor
[72] 7LXXQBNE resolve conflicts
[73] LWPFEZBI Merge lines.love
[74] 4YDBYBA4 clean up memory leak experiments

Change contents

file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

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
end

line = line+1