Function resolveGitConflicts

web/scripts/ragnar_modern.js:7688–7714

()

        if (d.reasons && d.reasons.length) {
            html += '<ul class="text-xs text-gray-400 mt-2 list-disc pl-5">' +
                d.reasons.map(r => '<li>' + escapeHtml(r) + '</li>').join('') + '</ul>';
        }
        out.innerHTML = html;
    } catch (e) {
        out.innerHTML = '<p class="text-sm text-red-400">Failed: ' + escapeHtml(e.message) + '</p>';
    } finally {
        _ndBusy(btn, false);
    }
}
async function ospfTrustBaseline() {
    try {
        await postAPI('/api/net/ospf-baseline', { action: 'reset' });
        addConsoleMessage('OSPF baseline reset — re-learning current routers & originators', 'info');
        await runOspfWatch();
    } catch (e) {
        addConsoleMessage('Failed to reset OSPF baseline: ' + e.message, 'error');
    }
}

// ---- STP/BPDU Watch (passive spanning-tree security scanner) ----------------
const _STP_VERDICT_STYLE = {
    clean:              ['bg-green-950/40 border-green-900 text-green-400', '✓ Spanning-tree root(s) and bridges match the baseline'],
    'topology-change':  ['bg-amber-950/50 border-amber-800 text-amber-300', '⚠ Topology-change churn — MAC tables being flushed (instability / TCN flood)'],
    'bpdu-flood':       ['bg-red-950/60 border-red-800 text-red-300', '🛑 BPDU flood — spanning-tree reconvergence storm (DoS)'],
    'rogue-bridge':     ['bg-red-950/60 border-red-800 text-red-300', '🛑 New STP bridge on the segment — unexpected switch / spoofed bridge'],
    'root-hijack':      ['bg-red-950/60 border-red-800 text-red-300', '🛑 ROOT HIJACK — a superior BPDU is taking over the root bridge (L2 MITM)'],
    unknown:            ['bg-slate-800 border-slate-700 text-slate-400', '— Could not determine'],
};
function _stpFillIfaces() {
    const sel = document.getElementById('stp-iface');