akkartik/pong.love - Change T3P6RYQPE6KNP56ZD5FHT5VMMGCZBFYIJIJAQZ6WEN6JPU233LWAC

resolve conflicts

Created by akkartik on February 17, 2025

T3P6RYQPE6KNP56ZD5FHT5VMMGCZBFYIJIJAQZ6WEN6JPU233LWAC

Dependencies

In channels

main

Change contents

File deletion: log.lua, log.lua

BFD:BFD[4.2] → [5.203577:203608]

BFD:BFD[5.203608] → [5.202725:202725]

B:BD[5.202763] → [3.157:397]

B:BD[5.203110] → [3.398:605]

B:BD[5.203264] → [3.606:813]

B:BD[5.203419] → [3.814:953]

∅:D[3.953] → [5.203552:203557]

∅:D[3.813] → [5.203372:203419]

∅:D[3.605] → [5.203218:203264]

∅:D[3.397] → [5.202993:203110]

  local info = debug.getinfo(stack_frame_index, 'Sl')
  local msg
  if type(obj) == 'string' then
    msg = obj
  else
    msg = json.encode(obj)
  end
  love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')
  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{250c} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '[ u250c ' .. name)
  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{2518} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '] u2518 ' .. name)
  if stack_frame_index == nil then
    stack_frame_index = 4
  end
  log_end(name, stack_frame_index)
  log_start(name, stack_frame_index)
end
end
function log_new(name, stack_frame_index)
end
function log_end(name, stack_frame_index)
end
-- for section delimiters we'll use specific Unicode box characters
function log_start(name, stack_frame_index)

Replacement in undo.lua at line 84 [8.1]

B:BD[7.3080] → [7.3080:3153]

  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}

[7.3080]

[7.3153]

  seen = seen or {}
  if seen[obj] then return seen[obj] end

Replacement in undo.lua at line 87 [8.1]
B:BD[7.3206] → [7.3206:3224]
```
  s[obj] = result
```
[7.3206]
[7.3224]
```
  seen[obj] = result
```

Replacement in undo.lua at line 89 [8.1]

B:BD[7.3251] → [7.3251:3295]

    result[deepcopy(k, s)] = deepcopy(v, s)

[7.3251]

[7.3295]

    result[deepcopy(k, seen)] = deepcopy(v, seen)

Deletion in undo.lua at line 97 [8.1]
B:BD[7.3386] → [2.59:59]
B:BD[8.2498] → [9.0:61]
BD:BD[8.2498] → [9.0:61]
B:BD[8.2624] → [9.62:83]
BD:BD[8.2624] → [9.62:83]
B:BD[8.2669] → [9.84:134]
BD:BD[8.2669] → [9.84:134]
```
  seen = seen or {}
  if seen[obj] then return seen[obj] end
  seen[obj] = result
    result[deepcopy(k, seen)] = deepcopy(v, seen)
```
Solving an order conflict in undo.lua at line 97 [8.1]
[7.3386]

Replacement in source_undo.lua at line 87 [5.68]

B:BD[10.3082] → [10.3082:3155]

  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}

[10.3082]

[10.3155]

  seen = seen or {}
  if seen[obj] then return seen[obj] end

Replacement in source_undo.lua at line 90 [5.68]
B:BD[10.3208] → [10.3208:3226]
```
  s[obj] = result
```
[10.3208]
[10.3226]
```
  seen[obj] = result
```

Replacement in source_undo.lua at line 92 [5.68]

B:BD[10.3253] → [10.3253:3297]

    result[deepcopy(k, s)] = deepcopy(v, s)

[10.3253]

[10.3297]

    result[deepcopy(k, seen)] = deepcopy(v, seen)

Deletion in source_undo.lua at line 100 [5.68]
B:BD[10.3388] → [2.777:777]
B:BD[5.3213] → [3.6:67]
BD:BD[5.3213] → [3.6:67]
B:BD[5.3339] → [3.68:89]
BD:BD[5.3339] → [3.68:89]
B:BD[5.3384] → [3.90:140]
BD:BD[5.3384] → [3.90:140]
```
  seen = seen or {}
  if seen[obj] then return seen[obj] end
  seen[obj] = result
    result[deepcopy(k, seen)] = deepcopy(v, seen)
```
Solving an order conflict in source_undo.lua at line 100 [5.68]
[10.3388]

Replacement in log.lua at line 2 [12.260]

B:BD[12.298] → [13.13:243]

	local info = debug.getinfo(stack_frame_index, 'Sl')
	local msg
	if type(obj) == 'string' then
		msg = obj
	else
		msg = json.encode(obj)
	end
	love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')

[12.298]

[12.453]

  local info = debug.getinfo(stack_frame_index, 'Sl')
  local msg
  if type(obj) == 'string' then
    msg = obj
  else
    msg = json.encode(obj)
  end
  love.filesystem.append('log', info.short_src..':'..info.currentline..': '..msg..'\n')

Replacement in log.lua at line 21 [12.260]

B:BD[14.238] → [14.238:272]

B:BD[14.272] → [13.274:303]

B:BD[13.303] → [6.277:414]

	if stack_frame_index == nil then
		stack_frame_index = 3
	end
	-- I'd like to use the unicode character \u{250c} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '[ u250c ' .. name)

[14.238]

[15.222]

  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{250c} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '[ u250c ' .. name)

Replacement in log.lua at line 29 [12.260]

B:BD[14.392] → [14.392:426]

B:BD[14.426] → [13.304:333]

B:BD[13.333] → [6.415:552]

	if stack_frame_index == nil then
		stack_frame_index = 3
	end
	-- I'd like to use the unicode character \u{2518} here, but it doesn't work
	-- in OpenBSD.
	log(stack_frame_index, '] u2518 ' .. name)

[14.392]

[15.278]

  if stack_frame_index == nil then
    stack_frame_index = 3
  end
  -- I'd like to use the unicode character \u{2518} here, but it doesn't work
  -- in OpenBSD.
  log(stack_frame_index, '] u2518 ' .. name)

Replacement in log.lua at line 38 [12.260]

B:BD[14.546] → [14.546:580]

B:BD[14.580] → [13.334:363]

∅:D[13.363] → [14.612:682]

B:BD[14.612] → [14.612:682]

	if stack_frame_index == nil then
		stack_frame_index = 4
	end
	log_end(name, stack_frame_index)
	log_start(name, stack_frame_index)

[14.546]

[16.13]

  if stack_frame_index == nil then
    stack_frame_index = 4
  end
  log_end(name, stack_frame_index)
  log_start(name, stack_frame_index)

resolve conflicts

Dependencies

In channels

Change contents

File deletion: log.lua, log.lua

Replacement in undo.lua at line 84 [8.1]

Replacement in undo.lua at line 87 [8.1]

Replacement in undo.lua at line 89 [8.1]

Deletion in undo.lua at line 97 [8.1]

Solving an order conflict in undo.lua at line 97 [8.1]

Replacement in source_undo.lua at line 87 [5.68]

Replacement in source_undo.lua at line 90 [5.68]

Replacement in source_undo.lua at line 92 [5.68]

Deletion in source_undo.lua at line 100 [5.68]

Solving an order conflict in source_undo.lua at line 100 [5.68]

Replacement in log.lua at line 2 [12.260]

Replacement in log.lua at line 21 [12.260]

Replacement in log.lua at line 29 [12.260]

Replacement in log.lua at line 38 [12.260]