akkartik/bf.love - Change QZUFJMD5OTAZGSUO4HSJ2NNNRJR7NOKIVOIIGHWM6IF4PFNMQZHAC

resolve conflicts

Created by akkartik on July 22, 2024

QZUFJMD5OTAZGSUO4HSJ2NNNRJR7NOKIVOIIGHWM6IF4PFNMQZHAC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[7.2] → [8.147062:147101]

BFD:BFD[8.147101] → [8.83723:83723]

B:BD[10.70] → [6.84:159]

B:BD[8.99269] → [5.309:334]

B:BD[8.100042] → [5.335:360]

B:BD[8.103025] → [5.361:386]

B:BD[8.105455] → [5.387:412]

∅:D[5.412] → [8.105455:105544]

∅:D[5.386] → [8.103025:103057]

∅:D[5.360] → [8.100042:100077]

∅:D[5.334] → [8.99269:99353]

∅:D[6.159] → [10.147:244]

      -- The modifiers didn't change the key. Handle it in keychord_press.
    schedule_save(State)
    schedule_save(State)
    schedule_save(State)
    schedule_save(State)
  --== shortcuts that move the cursor
  elseif chord == 'left' then
    Text.left(State)
  elseif chord == 'delete' then
  elseif chord == 'backspace' then
  elseif chord == 'tab' then
    local before = snapshot(State, State.cursor1.line)
      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[7.2] → [8.165725:165764]
BFD:BFD[7.2] → [8.165725:165764]
BFD:BFD[8.165764] → [8.152440:152440]
B:BD[11.21059] → [5.417:461]
B:BD[11.22639] → [5.462:487]
B:BD[8.162972] → [5.488:590]
∅:D[5.590] → [8.162972:162997]
∅:D[5.487] → [12.31204:31211]
∅:D[5.461] → [11.21059:21096]
```
                       schedule_save(State)
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
    schedule_save(State)
  else
                     end,
        })
```

Replacement in source_text.lua at line 201 [14.83786]

B:BD[13.70] → [13.70:147]

      -- The modifiers didn't change the key. Handle it in keychord_pressed.

[13.70]

[13.147]

      -- The modifiers didn't change the key. Handle it in keychord_press.

Deletion in source_text.lua at line 233 [14.83786]
B:BD[14.99055] → [15.21213:21239]
```
    State.selection1 = {}
```
Deletion in source_text.lua at line 236 [14.83786]
B:BD[14.99205] → [14.99205:99230]
```
    schedule_save(State)
```
Insertion in source_text.lua at line 237 [14.83786]
[14.99332]
[14.99332]
```
    schedule_save(State)
```

Insertion in source_text.lua at line 247 [14.83786]

[14.99991]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 249 [14.83786]

B:BD[14.100016] → [14.100016:100105]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Insertion in source_text.lua at line 295 [14.83786]

[16.1088]

[14.102974]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 297 [14.83786]

B:BD[14.102999] → [14.102999:103088]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 329 [14.83786]
B:BD[14.105404] → [14.105404:105429]
```
    schedule_save(State)
```
Insertion in source_text.lua at line 330 [14.83786]
[14.105518]
[14.105518]
```
    schedule_save(State)
```
Deletion in source_edit.lua at line 192 [14.152503]
B:BD[17.19441] → [17.19441:19485]
```
                       schedule_save(State)
```
Insertion in source_edit.lua at line 193 [14.152503]
[17.19609]
[17.19609]
```
                       schedule_save(State)
```
Deletion in source_edit.lua at line 302 [14.152503]
∅:D[18.5857] → [17.20988:21013]
B:BD[17.20988] → [17.20988:21013]
```
    schedule_save(State)
```
Insertion in source_edit.lua at line 306 [14.152503]
[17.21189]
[15.24400]
```
    schedule_save(State)
```

Insertion in source_edit.lua at line 494 [14.152503]

[14.163035]

    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Deletion in source_edit.lua at line 496 [14.152503]

B:BD[14.163060] → [14.163060:163162]

    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Deletion in edit.lua at line 368 [20.413]
B:BD[19.10055] → [19.10055:10080]
```
    schedule_save(State)
```
Replacement in edit.lua at line 369 [20.413]
B:BD[19.10182] → [19.10182:10204]
```
  -- dispatch to text
```
[19.10182]
[19.10204]
```
    schedule_save(State)
```
Deletion in edit.lua at line 448 [20.413]
B:BD[19.12430] → [3.157:157]
B:BD[20.14368] → [5.679:781]
BD:BD[20.14368] → [5.679:781]
B:BD[20.8797] → [5.653:678]
BD:BD[20.8797] → [5.653:678]
B:BD[22.935] → [5.608:652]
BD:BD[22.935] → [5.608:652]
```
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
    schedule_save(State)
                       schedule_save(State)
```
Solving an order conflict in edit.lua at line 448 [20.413]
[19.12430]

Deletion in README.md at line 78 [23.6]

B:BD[21.12675] → [2.35:35]

B:BD[24.131] → [4.0:179]

BD:BD[24.131] → [4.0:179]

* https://codeberg.org/eril/lines2html.love provides the option to export
  just the drawings to a directory. Also provides a CLI, which should be more
  natural for many people.

Solving an order conflict in README.md at line 78 [23.6]
[21.12675]
[25.145]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

Replacement in source_text.lua at line 201 [14.83786]

Deletion in source_text.lua at line 233 [14.83786]

Deletion in source_text.lua at line 236 [14.83786]

Insertion in source_text.lua at line 237 [14.83786]

Insertion in source_text.lua at line 247 [14.83786]

Deletion in source_text.lua at line 249 [14.83786]

Insertion in source_text.lua at line 295 [14.83786]

Deletion in source_text.lua at line 297 [14.83786]

Deletion in source_text.lua at line 329 [14.83786]

Insertion in source_text.lua at line 330 [14.83786]

Deletion in source_edit.lua at line 192 [14.152503]

Insertion in source_edit.lua at line 193 [14.152503]

Deletion in source_edit.lua at line 302 [14.152503]

Insertion in source_edit.lua at line 306 [14.152503]

Insertion in source_edit.lua at line 494 [14.152503]

Deletion in source_edit.lua at line 496 [14.152503]

Deletion in edit.lua at line 368 [20.413]

Replacement in edit.lua at line 369 [20.413]

Deletion in edit.lua at line 448 [20.413]

Solving an order conflict in edit.lua at line 448 [20.413]

Deletion in README.md at line 78 [23.6]

Solving an order conflict in README.md at line 78 [23.6]