Code

choose whether to merge/replace#93

Code

Merged

BrianHicks merged 7 commits intomainbytes-zone/beeps:mainfrom dont-throw-out-informationbytes-zone/beeps:dont-throw-out-informationCopy head branch name to clipboardJan 28, 2025

+73-18

Commits

Commits on Jan 28, 2025

• add a popover confirming whether to replace or merge data

  BrianHicks

  committed
  ac67da1

  Copy full SHA for ac67da1

• ask whether to replace or merge

  BrianHicks

  committed
  7943fd5

  Copy full SHA for 7943fd5

• don't set first sync when handling popover result

  BrianHicks

  committed
  9de84af

  Copy full SHA for 9de84af

• don't replace/merge on the second sync if we take a little bit

  BrianHicks

  committed
  0cc053d

  Copy full SHA for 0cc053d

• update changelog

  BrianHicks

  committed
  15c36c9

  Copy full SHA for 15c36c9

• bump to 0.5.2

  BrianHicks

  committed
  5419de3

  Copy full SHA for 5419de3

• mark 0.5.2 release date

  BrianHicks

  committed
  ee659d0

  Copy full SHA for ee659d0