Code

wip: new merging logic, updated tests#56

Code

Draft

imorland wants to merge 8 commits intomasterFriendsOfFlarum/merge-discussions:masterfrom im/refactorFriendsOfFlarum/merge-discussions:im/refactorCopy head branch name to clipboard

+584-177

Commits

Commits on Nov 3, 2023

• wip: new merging logic, updated tests

  imorland

  committed
  782e1a8

  Copy full SHA for 782e1a8

• Apply fixes from StyleCI

  StyleCIBot

  committed
  80f6ef2

  Copy full SHA for 80f6ef2

• wip: making progress

  imorland

  committed
  434706a

  Copy full SHA for 434706a

• Apply fixes from StyleCI

  StyleCIBot

  committed
  720f726

  Copy full SHA for 720f726

• silence stan about flarum/lock

  imorland

  committed
  1d9727e

  Copy full SHA for 1d9727e

Commits on Nov 4, 2023

• wip: only one fail now

  imorland

  committed
  09c346c

  Copy full SHA for 09c346c

• Apply fixes from StyleCI

  StyleCIBot

  committed
  2a376bd

  Copy full SHA for 2a376bd

Commits on Nov 6, 2023

• describe what the data provider is doing

  imorland

  committed
  6f145ec

  Copy full SHA for 6f145ec