user
2 lines
1.6 KiB
XML
2 lines
1.6 KiB
XML
<svg xmlns="http://www.w3.org/2000/svg" width="600" height="210" viewBox="0 0 600 210" role="img" aria-labelledby="title desc"><title id="title">Rebase i konflikt</title><desc id="desc">Commit feature jest odtwarzany na nowej bazie main; konflikt zatrzymuje operację do jawnego rozwiązania i continue.</desc><defs><marker id="a" markerWidth="9" markerHeight="9" refX="8" refY="3" orient="auto"><path d="M0 0L0 6L8 3z" fill="#16324a"/></marker></defs><rect width="600" height="210" fill="#f7fafc"/><g fill="#eef3f7" stroke="#16324a" stroke-width="2"><rect x="20" y="55" width="120" height="90" rx="10"/><rect x="170" y="55" width="120" height="90" rx="10"/><rect x="320" y="55" width="120" height="90" rx="10"/><rect x="470" y="55" width="110" height="90" rx="10"/></g><g font-family="system-ui,sans-serif" text-anchor="middle" fill="#16324a"><text x="80" y="88" font-size="16" font-weight="700">REBASE</text><text x="80" y="116" font-size="13">new base</text><text x="230" y="88" font-size="16" font-weight="700">CONFLICT</text><text x="230" y="116" font-size="13">UU file</text><text x="380" y="88" font-size="16" font-weight="700">RESOLVE</text><text x="380" y="116" font-size="13">edit + add</text><text x="525" y="88" font-size="16" font-weight="700">CONTINUE</text><text x="525" y="116" font-size="13">linear log</text></g><g stroke="#16324a" stroke-width="3" marker-end="url(#a)"><path d="M140 100H160"/><path d="M290 100H310"/><path d="M440 100H460"/></g><text x="300" y="184" font-family="system-ui,sans-serif" text-anchor="middle" font-size="15" fill="#b6402d">po konflikcie zawsze: status → edit → add → continue → verify</text></svg>
|