akkartik/pong.love - Change 6YWKM6WS4IKDNRDZED7A7L5G7SR5PXINOH53X2IH2DFJKS4TVPZQC

resolve conflicts

Created by akkartik on December 17, 2023

6YWKM6WS4IKDNRDZED7A7L5G7SR5PXINOH53X2IH2DFJKS4TVPZQC

Dependencies

In channels

main

Change contents

Insertion in text_tests.lua at line 858 [6.2]
[5.1366]
[5.1366]
```
  edit.draw(Editor_state)
```
Deletion in text_tests.lua at line 2055 [6.2]
B:BD[7.41621] → [2.494:494]
B:BD[8.467] → [9.0:26]
BD:BD[8.467] → [9.0:26]
```
  edit.draw(Editor_state)
```
Solving an order conflict in text_tests.lua at line 2055 [6.2]
[7.41621]
Deletion in source_text_tests.lua at line 137 [11.3561]
B:BD[10.1374] → [4.7:33]
BD:BD[10.1374] → [4.7:33]
```
  edit.draw(Editor_state)
```
Insertion in source_text_tests.lua at line 884 [11.3561]
[5.5623]
[5.5623]
```
  edit.draw(Editor_state)
```
Replacement in source_edit.lua at line 242 [11.152503]
∅:D[12.109] → [13.7558:7637]
∅:D[5.8646] → [13.7558:7637]
B:BD[14.8954] → [13.7558:7637]
```
  if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then
```
[5.8646]
[13.7637]
```
  if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
```
Deletion in source_edit.lua at line 278 [11.152503]
B:BD[13.8645] → [3.48:48]
B:BD[10.4572] → [4.39:110]
BD:BD[10.4572] → [4.39:110]
BD:BD[10.4572] → [4.39:110]
```
  if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
```
Solving an order conflict in source_edit.lua at line 278 [11.152503]
[13.8645]
[10.4943]
Deletion in button.lua at line 19 [17.2058]
B:BD[16.465] → [15.738:761]
BD:BD[16.465] → [15.738:761]
```
  local result = false
```
Resurrecting zombie bytes in button.lua at line 19 [17.2058]
B:B[17.2443] → [9.338:409]
BD:B[17.2443] → [9.338:409]
```
function mouse_press_consumed_by_any_button(State, x, y, mouse_button)
```

Insertion in button.lua at line 20 [17.2058]

[9.409]

[16.465]

  local button_pressed = false
  local consume_press = true

Replacement in button.lua at line 25 [17.2058]

B:BD[18.66] → [15.762:820]

        if not ev.onpress1() then
          result = true

[18.66]

[19.395]

        button_pressed = true
        if ev.onpress1() then
          consume_press = false

Replacement in button.lua at line 32 [17.2058]
B:BD[17.2671] → [15.821:837]
```
  return result
```
[17.2671]
[17.2671]
```
  return button_pressed and consume_press
```

resolve conflicts

Dependencies

In channels

Change contents

Insertion in text_tests.lua at line 858 [6.2]

Deletion in text_tests.lua at line 2055 [6.2]

Solving an order conflict in text_tests.lua at line 2055 [6.2]

Deletion in source_text_tests.lua at line 137 [11.3561]

Insertion in source_text_tests.lua at line 884 [11.3561]

Replacement in source_edit.lua at line 242 [11.152503]

Deletion in source_edit.lua at line 278 [11.152503]

Solving an order conflict in source_edit.lua at line 278 [11.152503]

Deletion in button.lua at line 19 [17.2058]

Resurrecting zombie bytes in button.lua at line 19 [17.2058]

Insertion in button.lua at line 20 [17.2058]

Replacement in button.lua at line 25 [17.2058]

Replacement in button.lua at line 32 [17.2058]