akkartik/sokoban.love - Change SWEQVCBONCI2FVJEB622IPEVEU7E5F722SDPXS7IR66YTPDXPJOAC

resolve conflicts

Created by akkartik on October 26, 2025

SWEQVCBONCI2FVJEB622IPEVEU7E5F722SDPXS7IR66YTPDXPJOAC

Dependencies

In channels

main

Change contents

Insertion in screens/main at line 17 [2.6482]

[2.6915]

  local x, y = love.mouse.getPosition()
  if mouse_hover_on_any_button(ui_state, x,y) then
    love.mouse.setCursor(Hand_icon)
  else
    love.mouse.setCursor(Arrow_icon)
  end

Insertion in 0004-on.update at line 10 [6.1708]

[5.3253]

		local x, y = love.mouse.getPosition()
		if mouse_hover_on_any_button(Global_state, x,y) then
			love.mouse.setCursor(Hand_icon)
		else
			love.mouse.setCursor(Arrow_icon)
		end

Resurrecting zombie bytes in 0004-on.update at line 25 [6.1708]
B:B[7.699] → [4.278:283]
BD:B[7.699] → [4.278:283]
```
	end
```
Solving an order conflict in 0004-on.update at line 25 [6.1708]
[3.240]
[4.278]
Replacement in 0004-on.update at line 26 [6.1708]
B:BD[4.283] → [4.283:451]
BD:BD[4.283] → [4.283:451]
∅:D[3.240] → [7.699:704]
∅:D[4.451] → [7.699:704]
∅:D[5.3589] → [7.699:704]
B:BD[7.699] → [7.699:704]
B:BD[7.704] → [3.241:245]
B:BD[8.1949] → [4.452:456]
BD:BD[8.1949] → [4.452:456]
```
	local x, y = love.mouse.getPosition()
	if mouse_hover_on_any_button(Global_state, x,y) then
		love.mouse.setCursor(Hand_icon)
	else
		love.mouse.setCursor(Arrow_icon)
	end
end
end
```
[4.283]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

Insertion in screens/main at line 17 [2.6482]

Insertion in 0004-on.update at line 10 [6.1708]

Resurrecting zombie bytes in 0004-on.update at line 25 [6.1708]

Solving an order conflict in 0004-on.update at line 25 [6.1708]

Replacement in 0004-on.update at line 26 [6.1708]