akkartik/wardley.love - Change ALONIFBWMYA2BT6LXRWOPRWSPLQSQMFRJ2KLVROCFJZVBD2O5H5QC

resolve conflicts

Created by akkartik on September 9, 2023

ALONIFBWMYA2BT6LXRWOPRWSPLQSQMFRJ2KLVROCFJZVBD2O5H5QC

Dependencies

In channels

main

Change contents

Insertion in app.lua at line 428 [5.2]

[4.821]

[2.77]

        end
      end
  App.read_file =
      function(path)
        if not is_absolute_path(path) then
          return --[[status]] false, 'Please use an unambiguous absolute path.'
        end
        local f, err = App.open_for_reading(path)
        if err then
          return --[[status]] false, err

Insertion in app.lua at line 439 [5.2]

[2.89]

[4.822]

        local contents = f:read()
        f:close()
        return contents

Deletion in app.lua at line 481 [5.2]

B:BD[4.821] → [6.188:210]

BD:BD[4.821] → [6.188:210]

B:BD[6.210] → [3.0:18]

BD:BD[6.210] → [3.0:18]

∅:D[3.18] → [6.223:490]

B:BD[6.223] → [6.223:490]

BD:BD[6.223] → [6.223:490]

        end
      end
  App.read_file =
      function(path)
        if not is_absolute_path(path) then
          return --[[status]] false, 'Please use an unambiguous absolute path.'
        end
        local f, err = App.open_for_reading(path)
        if err then
          return --[[status]] false, err

Solving an order conflict in app.lua at line 481 [5.2]
[8.8166]