Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
194973e
i18n: extract the save-conflict and location-conflict modals
Oct 16, 2026
4fa39cd
i18n: extract the Settings script, header, tabs and the general and s…
Oct 16, 2026
8836b9b
i18n: extract the Settings storage, advanced and support tabs
Oct 16, 2026
74ec18d
Watcher lists a folder without blocking its removal
Oct 27, 2026
2a7d7ce
test(native): reject root mutation while native writer is active
Seagulls Oct 30, 2026
5274dfa
fix(native): coordinate root topology changes with admitted writers
Seagulls Oct 30, 2026
5cd0a18
fix(native): coordinate root topology changes with admitted writers
Seagulls Oct 30, 2026
089ad2f
fix(native): coordinate root topology changes with admitted writers
Seagulls Oct 30, 2026
a2b92ca
test(native): verify lifetime of daemon presence lock
Seagulls Oct 30, 2026
62acfd2
fix(cli): require daemon presence admission for offline root edits
Seagulls Oct 30, 2026
ec8ff81
fix(cli): require daemon presence admission for offline root edits
Seagulls Oct 30, 2026
0dfeb69
fix(cli): require daemon presence admission for offline root edits
Seagulls Oct 30, 2026
d9d2a16
fix(native): retain root topology reservation across sync admission a…
Seagulls Oct 30, 2026
b1bb0dd
fix(native): retain root topology reservation across sync admission a…
Seagulls Oct 30, 2026
fcdbb29
fix(native): retain root topology reservation across sync admission a…
Seagulls Oct 30, 2026
cf132ba
fix(native): retain root topology reservation across sync admission a…
Seagulls Oct 30, 2026
ab36a00
test(sync): cover queued writers and root topology rejection
Seagulls Oct 30, 2026
bded266
test(e2e): retry transient native topology 409 after initial sync drains
Seagulls Oct 30, 2026
1b65e76
fix(native): bounded context-aware wait around existing topology rese…
Seagulls Oct 31, 2026
b77c2e8
fix(api): wait up to 30 seconds before refusing busy root edits
Seagulls Oct 31, 2026
10dd814
fix(api): bound primary-path admission and fail closed on combined pa…
Seagulls Oct 31, 2026
424e9d7
fix(api): remove daemon presence lock incompatible with desktop startup
Seagulls Oct 31, 2026
7610084
fix(cli): extract cross-process daemon/CLI admission to separate life…
Seagulls Oct 31, 2026
bf261db
test(api): move daemon presence ownership proof out of PR139
Seagulls Oct 31, 2026
cec3a36
refactor(cli): restore baseline commands; move daemon ownership to se…
Seagulls Oct 31, 2026
02624f5
refactor(cli): restore baseline commands; move daemon ownership to se…
Seagulls Oct 31, 2026
6a4ade8
test(api): permit short per-server topology admission deadline
Seagulls Oct 31, 2026
525db76
test(api): make bounded wait deterministic with per-server test timeout
Seagulls Oct 31, 2026
ca995ab
test(api): bound active-writer 409 checks without 30-second test hangs
Seagulls Oct 31, 2026
66b7efa
test(api): one root request waits for native writer and preserves bytes
Seagulls Oct 31, 2026
eea37f7
test(e2e): rely on one server-side bounded wait, not repeated client …
Seagulls Oct 31, 2026
985ef27
fix(native): avoid blocking timer drain on cancelled admission
Seagulls Oct 31, 2026
8159c99
fix(native): reconcile topology admission with merged upstream and fo…
Nov 2, 2026
dbdace9
Merge pull request #124 from Janlhin/pr-3-conflicts-and-settings
Omar-VF Nov 3, 2026
c5a7352
i18n: extract Devices and the root App
Janlhin Nov 3, 2026
24753b5
Merge pull request #139 from Seagulls/fix/upstream-root-topology
Omar-VF Nov 3, 2026
24b29c8
A drive that is not ready does not hold a save folder
Omar-VF Nov 5, 2026
5c43384
Merge pull request #147 from Liquid-co/fix/relocate-unready-drive
Omar-VF Nov 5, 2026
8b591d8
Merge pull request #134 from Liquid-co/fix/watcher-dir-delete
Omar-VF Nov 7, 2026
abce458
Folder-trust table as migration 0044
Oct 27, 2026
4b0a18f
Say an offer once, not at every sync
Oct 27, 2026
81c9113
Set the trust flag after the peer entry is built
Oct 27, 2026
fcfe98b
Folder trust: a database from a build with migration 0038 opens
Omar-VF Nov 7, 2026
3fb4ad3
Merge pull request #150 from Liquid-co/merge/dev-followups
Omar-VF Nov 7, 2026
6bf661f
Find Cemu on Windows, and stamp the Deck plugin with the release tag
Omar-VF Nov 7, 2026
3eb6154
Merge pull request #151 from Liquid-co/fix/cemu-and-plugin-version
Omar-VF Nov 7, 2026
304f78a
Merge pull request #145 from Janlhin/pr-4-devices-and-app
Omar-VF Nov 7, 2026
0b39dc8
i18n: finish the two app strings left over from #145
Janlhin Nov 7, 2026
4764979
Merge pull request #152 from Janlhin/fix/145-app-strings
Omar-VF Nov 9, 2026
a9e7045
fix(store): reserve import claim only for path changes
Nov 9, 2026
0fe57b4
test(store): keep metadata writable during import admission
Nov 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,17 @@ jobs:
cp opensave-decky-plugin/package.json decky-pkg/OpenSave/
cp opensave-decky-plugin/main.py decky-pkg/OpenSave/
cp opensave-decky-plugin/dist/index.js decky-pkg/OpenSave/dist/
# The zip says the version of the tag it is released under. Plugin
# managers compare the two, and a mismatch offers the same update
# again and again (#149). A manual run has no tag: it keeps the files'.
if [ "$GITHUB_REF_TYPE" = "tag" ]; then
V="${GITHUB_REF_NAME#v}"
for f in plugin.json package.json; do
jq --arg v "$V" '.version = $v' "decky-pkg/OpenSave/$f" > "$f.stamped"
mv "$f.stamped" "decky-pkg/OpenSave/$f"
test "$(jq -r .version "decky-pkg/OpenSave/$f")" = "$V"
done
fi
(cd decky-pkg && zip -r ../OpenSave-decky-plugin.zip OpenSave)
unzip -l OpenSave-decky-plugin.zip

Expand Down
47 changes: 21 additions & 26 deletions cmd/opensave-app/frontend/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { startController, controllerOn, padUsed, pageStep } from './lib/controller.js';
import { startFocusRing } from './lib/focusring.js';
import { appearance } from './lib/appearance.js';
import { locale, resolveLocale } from './lib/i18n.js';
import { locale, resolveLocale, t } from './lib/i18n.js';
import { paletteOpen } from './lib/shortcuts.js';
import { newlyEmptied } from './lib/emptied.js';
import { demandAttention } from './lib/notify.js';
Expand Down Expand Up @@ -111,13 +111,13 @@
const { now, fresh } = newlyEmptied(emptiedBefore, all);
emptiedBefore = now;
for (const g of fresh) {
toast(`Every save file of ${g.name} was deleted here. Your other devices keep theirs until you choose.`, 'warning', {
toast($t('app.emptiedBody', { name: g.name }), 'warning', {
ttl: 15000,
action: { label: 'Choose', run: () => navigate('game', { gameId: g.id }) }
action: { label: $t('app.choose'), run: () => navigate('game', { gameId: g.id }) }
});
demandAttention('emptied', {
title: g.name,
body: 'Every save file was deleted here. Your other devices keep theirs until you choose.',
body: $t('app.emptiedBody', { name: g.name }),
game: g
});
}
Expand Down Expand Up @@ -198,45 +198,45 @@
<div class="update-banner installing">
<span class="with-icon">
{#if $appUpdate.state === 'downloading'}
<Download size={16} /> Updating OpenSave — downloading {$appUpdate.percentage ?? 0}%…
<Download size={16} /> {$t('app.updatingDownloading', { n: $appUpdate.percentage ?? 0 })}
{:else if $appUpdate.state === 'installing'}
<Wrench size={16} /> Installing update…
<Wrench size={16} /> {$t('app.installingUpdate')}
{:else}
<RefreshCw size={16} /> Restarting with the new version…
<RefreshCw size={16} /> {$t('app.restartingVersion')}
{/if}
<em>The app restarts itself when done — your games keep syncing.</em>
<em>{$t('app.restartsItself')}</em>
</span>
</div>
{:else if update}
<div class="update-banner">
<span class="with-icon"><Sparkles size={16} /> OpenSave {update.latest} is available — you're on {update.current}.</span>
<span class="with-icon"><Sparkles size={16} /> {$t('app.updateAvailable', { latest: update.latest, current: update.current })}</span>
<div class="update-actions">
{#if update.notes}
<button class="btn small ghost" on:click={() => (showNotes = !showNotes)}>
{showNotes ? 'Hide notes' : "What's new"}
{showNotes ? $t('app.hideNotes') : $t('app.whatsNew')}
</button>
{/if}
{#if update.assetUrl}
<button class="btn small primary" disabled={installStarted} on:click={installRelease}>
{installStarted ? 'Starting…' : 'Install & restart'}
{installStarted ? $t('app.starting') : $t('app.installRestart')}
</button>
{:else if update.flatpak}
<button class="btn small primary" on:click={() => native.openExternal(update.url)}>Get .flatpak</button>
<button class="btn small primary" on:click={() => native.openExternal(update.url)}>{$t('app.getFlatpak')}</button>
{:else}
<button class="btn small primary" on:click={() => native.openExternal(update.url)}>Download</button>
<button class="btn small primary" on:click={() => native.openExternal(update.url)}>{$t('app.download')}</button>
{/if}
<button class="btn small ghost icon" on:click={() => (update = null)} aria-label="Dismiss" title="Dismiss"><X size={15} /></button>
<button class="btn small ghost icon" on:click={() => (update = null)} aria-label={$t('common.dismiss')} title={$t('common.dismiss')}><X size={15} /></button>
</div>
</div>
{#if showNotes && update.notes}
<div class="update-notes">{update.notes}</div>
{/if}
{:else if updatedTo}
<div class="update-banner">
<span class="with-icon"><Sparkles size={16} /> OpenSave was updated to v{updatedTo}.</span>
<span class="with-icon"><Sparkles size={16} /> {$t('app.updatedTo', { version: updatedTo })}</span>
<div class="update-actions">
<button class="btn small primary" on:click={openWhatsNew}>What's new</button>
<button class="btn small ghost icon" on:click={() => (updatedTo = '')} aria-label="Dismiss" title="Dismiss"><X size={15} /></button>
<button class="btn small primary" on:click={openWhatsNew}>{$t('app.whatsNew')}</button>
<button class="btn small ghost icon" on:click={() => (updatedTo = '')} aria-label={$t('common.dismiss')} title={$t('common.dismiss')}><X size={15} /></button>
</div>
</div>
{/if}
Expand All @@ -252,13 +252,13 @@
{#if bootError}
<div class="boot-error">
<img class="boot-logo" src={logoUrl} alt="OpenSave" />
<h2>OpenSave failed to start</h2>
<h2>{$t('app.failedToStart')}</h2>
<p>{bootError}</p>
<button class="btn primary" disabled={retrying} on:click={boot}>
{retrying ? 'Retrying…' : 'Retry'}
{retrying ? $t('app.retrying') : $t('app.retry')}
</button>
<p class="boot-hint">
Details are saved to <code>.opensave\opensave.log</code> in your user folder.
{$t('app.detailsSaved')}
</p>
</div>
{:else if ready}
Expand Down Expand Up @@ -290,7 +290,7 @@
{:else}
<div class="boot-loading">
<img class="boot-logo pulse" src={logoUrl} alt="OpenSave" />
<span>Starting OpenSave…</span>
<span>{$t('app.startingOpenSave')}</span>
</div>
{/if}
</div>
Expand Down Expand Up @@ -361,11 +361,6 @@
color: var(--text-dim) !important;
font-size: 0.8rem;
}
.boot-hint code {
background: var(--bg-raised);
padding: 1px 5px;
border-radius: 5px;
}
.update-banner {
display: flex;
align-items: center;
Expand Down
101 changes: 55 additions & 46 deletions cmd/opensave-app/frontend/src/components/ConflictModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import { visited } from '../lib/later.js';
import { api } from '../lib/api.js';
import { demandAttention } from '../lib/notify.js';
// `fmtTime` below has a parameter named `t`, so the translator comes in aliased.
import { t as i18n, segments } from '../lib/i18n.js';
import Chevron from './ui/Chevron.svelte';
import Gamepad2 from 'lucide-svelte/icons/gamepad-2';
import Monitor from 'lucide-svelte/icons/monitor';
Expand Down Expand Up @@ -58,7 +60,7 @@
}
$: gameName = current ? ($games[current[0]]?.name ?? current[0]) : '';
$: conflict = current ? current[1] : null;
$: peerName = conflict ? (conflict.peer.Name ?? conflict.peer.name ?? 'the other device') : '';
$: peerName = conflict ? (conflict.peer.Name ?? conflict.peer.name ?? $i18n('conflict.otherDevice')) : '';
$: peerType = conflict ? $peers[conflict.peer.ID ?? conflict.peer.id]?.deviceType : '';
$: localIcon = isHandheld($settings?.deviceType) ? Gamepad2 : Monitor;
$: peerIcon = isHandheld(peerType) ? Gamepad2 : Monitor;
Expand All @@ -71,9 +73,9 @@
const fresh = list.filter(([gid]) => !seen.has(gid));
if (fresh.length > 0) {
const game = $games[fresh[0][0]];
const name = game?.name ?? 'a game';
demandAttention('conflicts', { title: name, body: 'Its save changed here and on another device at once — choose which to keep.', game });
toast(`Save conflict for “${name}” — choose which version to keep`, 'error');
const name = game?.name ?? $i18n('conflict.aGame');
demandAttention('conflicts', { title: name, body: $i18n('conflict.attentionBody'), game });
toast($i18n('conflict.attentionToast', { name }), 'error');
}
seen = new Set(list.map(([gid]) => gid));
// Housekeeping: forget "applying" markers for conflicts that no longer
Expand Down Expand Up @@ -136,9 +138,9 @@
// different measurements.
function sideSummary(stats) {
const files = stats?.files;
if (files === 0) return 'save folder is empty';
if (files === 0) return $i18n('conflict.saveFolderEmpty');
if (typeof files !== 'number') return '';
return `whole save: ${files} file${files === 1 ? '' : 's'} · ${fmtSize(stats?.totalBytes ?? -1)}`;
return $i18n('conflict.wholeSave', { n: files, size: fmtSize(stats?.totalBytes ?? -1) });
}

async function resolve(resolution) {
Expand All @@ -156,7 +158,7 @@
});
applying = new Set(applying).add(gameId);
if (resolution !== 'keep-local') {
toast(`Applying your choice for “${name}” — transferring ${peerName}'s files…`, 'info');
toast($i18n('conflict.applyingToast', { name, peer: peerName }), 'info');
}
showDiff = false;
} catch (e) {
Expand All @@ -167,88 +169,99 @@
}

const fmtTime = (t) => (t ? new Date(t).toLocaleString() : '—');
const fmtMs = (ms) => (ms ? new Date(ms).toLocaleString() : 'unknown');
const fmtMs = (ms) => (ms ? new Date(ms).toLocaleString() : $i18n('conflict.unknown'));
const fmtSize = (n) =>
n < 0 ? '—' : n >= 1048576 ? (n / 1048576).toFixed(1) + ' MB' : n >= 1024 ? (n / 1024).toFixed(1) + ' KB' : n + ' B';
const diffIcon = (s) => (s === 'changed' ? '✱' : s === 'only-remote' ? '+' : '−');
const diffLabel = (s) =>
s === 'changed' ? 'differs' : s === 'only-remote' ? `only on ${peerName}` : 'only on this device';
s === 'changed'
? $i18n('conflict.differs')
: s === 'only-remote'
? $i18n('conflict.onlyOnPeer', { peer: peerName })
: $i18n('conflict.onlyOnDevice');

// The hint paragraph reads as one sentence stream in every language; the
// three option names arrive already quoted and are bolded in place.
const hintParams = (peerName) => ({
both: $i18n('conflict.keepBothQuoted'),
mine: $i18n('conflict.keepMineQuoted'),
theirs: $i18n('conflict.keepTheirsQuoted'),
peer: peerName
});
$: hintParts = segments($i18n('conflict.hintAll', hintParams(peerName)), hintParams(peerName), [
'both',
'mine',
'theirs'
]);
</script>

<svelte:window on:keydown={onKey} />

{#if current && conflict}
<div class="overlay" out:dialogOut|global>
<div class="modal card">
<h3 class="with-icon"><GitCompareArrows size={20} /> Save conflict — {gameName}</h3>
<h3 class="with-icon"><GitCompareArrows size={20} /> {$i18n('conflict.title', { game: gameName })}</h3>
<p class="desc">
Both this device and <strong>{peerName}</strong> changed this save since the last sync.
Pick which version to play from.
{#each segments($i18n('conflict.desc', { peer: peerName }), { peer: peerName }, ['peer']) as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
</p>

<div class="versions">
<div class="version" class:newer={newerSide === 'local'}>
<div class="v-head">
<span class="v-title with-icon"><svelte:component this={localIcon} size={16} /> This device</span>
{#if newerSide === 'local'}<span class="v-badge">played more recently</span>{/if}
<span class="v-title with-icon"><svelte:component this={localIcon} size={16} /> {$i18n('conflict.thisDevice')}</span>
{#if newerSide === 'local'}<span class="v-badge">{$i18n('conflict.playedRecently')}</span>{/if}
</div>
<div class="v-diff">
<strong>{changedCount + onlyLocalCount}</strong>
file{changedCount + onlyLocalCount === 1 ? '' : 's'} differ{changedCount + onlyLocalCount === 1
? 's'
: ''} here
{#each segments($i18n('conflict.diffHere', { n: changedCount + onlyLocalCount }), { n: changedCount + onlyLocalCount }, ['n']) as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
{#if localDiffBytes > 0}<span class="v-diff-bytes">· {fmtSize(localDiffBytes)}</span>{/if}
</div>
{#if onlyLocalCount > 0}
<div class="v-only">{onlyLocalCount} only on this device</div>
<div class="v-only">{$i18n('conflict.onlyHere', { n: onlyLocalCount })}</div>
{/if}
<div class="v-stats">{sideSummary(conflict.localStats)}</div>
<div class="v-time">last change {fmtMs(localMs)}</div>
<div class="v-time">{$i18n('conflict.lastChange', { time: fmtMs(localMs) })}</div>
</div>
<div class="version" class:newer={newerSide === 'remote'}>
<div class="v-head">
<span class="v-title with-icon"><svelte:component this={peerIcon} size={16} /> {peerName}</span>
{#if newerSide === 'remote'}<span class="v-badge">played more recently</span>{/if}
{#if newerSide === 'remote'}<span class="v-badge">{$i18n('conflict.playedRecently')}</span>{/if}
</div>
<div class="v-diff">
<strong>{changedCount + onlyRemoteCount}</strong>
file{changedCount + onlyRemoteCount === 1 ? '' : 's'} differ{changedCount + onlyRemoteCount === 1
? 's'
: ''} there
{#each segments($i18n('conflict.diffThere', { n: changedCount + onlyRemoteCount }), { n: changedCount + onlyRemoteCount }, ['n']) as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
{#if remoteDiffBytes > 0}<span class="v-diff-bytes">· {fmtSize(remoteDiffBytes)}</span>{/if}
</div>
{#if onlyRemoteCount > 0}
<div class="v-only">{onlyRemoteCount} only on {peerName}</div>
<div class="v-only">{$i18n('conflict.onlyThere', { n: onlyRemoteCount, peer: peerName })}</div>
{/if}
<div class="v-stats">{sideSummary(conflict.remoteStats)}</div>
<div class="v-time">last change {fmtMs(remoteMs)}</div>
<div class="v-time">{$i18n('conflict.lastChange', { time: fmtMs(remoteMs) })}</div>
</div>
</div>
{#if diffCapped && typeof conflict.onlyLocalTotal !== 'number'}
<p class="diff-capped">
Counts above cover the first {diffFiles.length} of {diffTotal} differing files.
{$i18n('conflict.diffCapped', { shown: diffFiles.length, total: diffTotal })}
</p>
{/if}

<ul class="consequences">
<li>
<strong>Keep mine</strong> / <strong>Keep both</strong>: nothing is deleted.
{#if onlyRemoteCount > 0}The {onlyRemoteCount} file{onlyRemoteCount === 1 ? '' : 's'} only on {peerName} {onlyRemoteCount === 1 ? 'is' : 'are'} brought here;{/if}
{#if changedCount > 0}where both have a file, yours is kept.{/if}
{#each segments($i18n('conflict.consequenceKeepBoth', { mine: $i18n('conflict.keepMine'), both: $i18n('conflict.keepBothName') }), { mine: $i18n('conflict.keepMine'), both: $i18n('conflict.keepBothName') }, ['mine', 'both']) as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
{#if onlyRemoteCount > 0}{$i18n('conflict.broughtHere', { n: onlyRemoteCount, peer: peerName })}{/if}
{#if changedCount > 0}{$i18n('conflict.keptWhere')}{/if}
</li>
<li class:danger={theirsDeletesMany}>
<strong>Keep theirs</strong>:
{#each segments($i18n('conflict.consequenceKeepTheirs', { theirs: $i18n('conflict.keepTheirs') }), { theirs: $i18n('conflict.keepTheirs') }, ['theirs']) as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
{#if theirsDeletes > 0}
<strong>deletes {theirsDeletes} file{theirsDeletes === 1 ? '' : 's'}</strong> that only this device has (snapshotted first).
<strong>{$i18n('conflict.deletesFiles', { n: theirsDeletes })}</strong>{$i18n('conflict.deletesTail')}
{:else}
nothing only this device has is lost.
{$i18n('conflict.deletesNothing')}
{/if}
</li>
</ul>

{#if conflict.diffTotal > 0}
<button class="diff-toggle" on:click={() => (showDiff = !showDiff)}>
<Chevron open={showDiff} /> What's different ({conflict.diffTotal} file{conflict.diffTotal === 1 ? '' : 's'})
<Chevron open={showDiff} /> {$i18n('conflict.diffToggle', { n: conflict.diffTotal })}
</button>
{#if showDiff}
<div class="diff-list">
Expand All @@ -264,28 +277,24 @@
</div>
{/each}
{#if conflict.diffTotal > conflict.diffFiles.length}
<div class="diff-more">…and {conflict.diffTotal - conflict.diffFiles.length} more</div>
<div class="diff-more">{$i18n('conflict.diffMore', { n: conflict.diffTotal - conflict.diffFiles.length })}</div>
{/if}
</div>
{/if}
{/if}

<div class="actions">
<button class="btn ghost later" disabled={busy} on:click={putOff} title="Nothing of this game syncs until you decide. Open the game to decide.">Decide later</button>
<button class="btn" disabled={busy} on:click={() => resolve('keep-local')}>Keep mine</button>
<button class="btn ghost later" disabled={busy} on:click={putOff} title={$i18n('conflict.decideLaterTitle')}>{$i18n('conflict.decideLater')}</button>
<button class="btn" disabled={busy} on:click={() => resolve('keep-local')}>{$i18n('conflict.keepMine')}</button>
<button class="btn" class:danger={theirsDeletesMany} disabled={busy} on:click={() => resolve('keep-remote')}
title={theirsDeletes > 0 ? `Deletes ${theirsDeletes} file(s) only this device has` : ''}>Keep theirs</button>
title={theirsDeletes > 0 ? $i18n('conflict.keepTheirsTitle', { n: theirsDeletes }) : ''}>{$i18n('conflict.keepTheirs')}</button>
<button class="btn primary" disabled={busy} on:click={() => resolve('merge-branch')}>
Keep both (recommended)
{$i18n('conflict.keepBoth')}
</button>
</div>
<p class="hint-line">
<History size={15} class="inline-icon" /> Nothing is lost whichever you pick. <strong>“Keep both”</strong> (recommended) keeps
playing yours — {peerName} receives it too — and keeps {peerName}'s version here on a branch you can switch
to. <strong>“Keep mine”</strong> makes your
version the shared one — {peerName} receives it (their old save is snapshotted first).
<strong>“Keep theirs”</strong> adopts {peerName}'s version here, snapshotting yours first.
Restore anything from the game's Snapshots / Branches tabs.
<History size={15} class="inline-icon" />
{#each hintParts as part}{#if part.bold}<strong>{part.text}</strong>{:else}{part.text}{/if}{/each}
</p>
</div>
</div>
Expand Down
Loading
Loading