git-sync-web 自动提交 2026-09-09 12:04:01

static/index.html

@@ -57,10 +57,20 @@
 				<div id="commit-list" class="commit-list">加载中…</div>
 			</div>
 			<div id="tab-conflict" class="tab-pane" hidden>
-				<div class="conflict-actions">
+				<div class="manual-actions">
+					<button class="btn btn-sm" id="btn-fetch">获取</button>
+					<button class="btn btn-sm" id="btn-pull">拉取</button>
+					<button class="btn btn-sm" id="btn-push">推送</button>
+				</div>
+				<div class="conflict-actions" id="pull-conflict-actions">
 					<button class="btn btn-danger" id="btn-abort">放弃合并</button>
 					<button class="btn btn-primary" id="btn-resolved">我已在本地解决，继续</button>
 				</div>
+				<div class="conflict-actions" id="push-conflict-actions" hidden>
+					<span class="hint" id="push-conflict-hint"></span>
+					<button class="btn btn-danger" id="btn-force-push">强制推送（--force-with-lease）</button>
+					<button class="btn" id="btn-abort-push">放弃强制推送</button>
+				</div>
 				<div id="conflict-list"></div>
 			</div>
 			<div id="tab-stats" class="tab-pane" hidden>
@@ -105,6 +115,13 @@
 								<option value="abort">abort（冲突后自动放弃）</option>
 							</select>
 						</label>
+						<label>推送策略（non-fast-forward）
+							<select name="push_strategy" id="f-push">
+								<option value="manual">manual（冲突后等待人工决策）</option>
+								<option value="rebase">rebase（变基到远程后重试）</option>
+								<option value="force">force（--force-with-lease 强制推送）</option>
+							</select>
+						</label>
 						<label>重试次数（HTTPS）
 							<input name="retry_count" id="f-retry" type="number" min="0" value="3">
 						</label>