akkartik/wardley.love - Change 24ZAORFUPPABGYGCYANCZ7I43G4N4I6C3HB5XWTGDNE3VGV6MSZQC

resolve conflicts

Created by akkartik on October 17, 2023

24ZAORFUPPABGYGCYANCZ7I43G4N4I6C3HB5XWTGDNE3VGV6MSZQC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[4.2] → [5.147062:147101]

BFD:BFD[5.147101] → [5.83723:83723]

B:BD[7.869] → [3.0:103]

∅:D[3.103] → [7.969:1233]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, bg={r=1,g=1,b=1},
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         if file_exists(filename) then
                           source.switch_to_file(filename)
                         end
                       end,
          })

File deletion: source_edit.lua, source_edit.lua

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

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

B:BD[8.561] → [3.104:182]

∅:D[3.182] → [9.20384:21096]

        button(State, 'draw', {x=buttonx, y=y+4, w=12,h=12, bg={r=1,g=1,b=0},
          icon = icon.insert_drawing,
          onpress1 = function()
                       Drawing.before = snapshot(State, line_index-1, line_index)
                       table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})
                       table.insert(State.line_cache, line_index, {})
                       if State.cursor1.line >= line_index then
                         State.cursor1.line = State.cursor1.line+1
                       end
                       schedule_save(State)
                       record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})
                     end,
        })

File deletion: commands.lua, commands.lua
BFD:BFD[4.2] → [5.207726:207762]
BFD:BFD[4.2] → [5.207726:207762]
BFD:BFD[5.207762] → [5.204370:204370]
B:BD[5.206991] → [3.279:380]
∅:D[3.380] → [10.218:244]
```
  button(Editor_state, 'menu', {x=x-5, y=y-2, w=width+5*2, h=Editor_state.line_height+2*2, bg=color,
    onpress1 = function()
```

Replacement in source_text.lua at line 37 [12.83786]

B:BD[11.869] → [11.869:969]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, color={1,1,1},

[11.869]

[11.969]

          button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height, bg={r=1,g=1,b=1},

Replacement in source_edit.lua at line 191 [12.152503]

B:BD[6.876] → [6.876:951]

        button(State, 'draw', {x=buttonx, y=y+4, w=12,h=12, color={1,1,0},

[6.876]

[13.18934]

        button(State, 'draw', {x=buttonx, y=y+4, w=12,h=12, bg={r=1,g=1,b=0},

Deletion in edit.lua at line 462 [15.413]

B:BD[14.269] → [3.183:278]

BD:BD[14.269] → [3.183:278]

        button(State, 'draw', {x=State.left-Margin_left+4, y=y+4, w=12,h=12, bg={r=1,g=1,b=0},

Solving an order conflict in edit.lua at line 462 [15.413]
[17.368]

Replacement in commands.lua at line 119 [12.203826]

B:BD[12.206447] → [18.3098:3214]

  button(Editor_state, 'menu', {x=x-5, y=y-2, w=width+5*2, h=Editor_state.line_height+2*2, color=colortable(color),

[12.206447]

[18.3214]

  button(Editor_state, 'menu', {x=x-5, y=y-2, w=width+5*2, h=Editor_state.line_height+2*2, bg=color,