25 lines
1.3 KiB
Markdown
25 lines
1.3 KiB
Markdown
---
|
||
title: Streamlit 工具箱已快进合并为唯一 main 分支
|
||
type: decision
|
||
permalink: main/projects/8e229c96-a83b-4a02-ac40-10a0a9da444e/streamlit-工具箱已快进合并为唯一-main-分支
|
||
stable_id: bb24ea46-7713-47cd-a2a5-8dbc9fd317dc
|
||
scope: project
|
||
memory_type: decision
|
||
project_id: 8e229c96-a83b-4a02-ac40-10a0a9da444e
|
||
usage_profile_id: 7aee455b-24cc-4008-bdaf-443721e6f939
|
||
status: active
|
||
revision: 1
|
||
request_id: marketgrid-decision-main-only-20260917
|
||
created_at: '2026-09-17T02:24:27.535980+00:00'
|
||
updated_at: '2026-09-17T02:24:27.535980+00:00'
|
||
tags:
|
||
- git
|
||
- main
|
||
- streamlit
|
||
---
|
||
|
||
用户在开发暂停后明确要求：把当时当前分支 feat/Streamlit（HEAD 75af8f9）作为主分支，删除其他分支，本地与远端都只保留 main，并同步到 git.asio.asia。
|
||
|
||
执行结果：feat/Streamlit 是 main 的直线后代（快进 19 个提交），已 git checkout main && git merge --ff-only feat/Streamlit，再推送 origin/main（非强制推送）。已删除远端 dev、feat/Streamlit、feature/competitor-signal；已删除本地 backup/main-before-marketgrid-20260724、dev、feat/Streamlit、feature/competitor-signal。当前唯一分支为 main@75af8f9，与 origin/main 一致。
|
||
|
||
此决定取代此前「Streamlit 首版不在 main 实施、只留 feat/Streamlit」的约定。 |