devstar/docs
11
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

更改sharebuild-aosp14文档 #5

Closed
ych wants to merge 0 commits from ych/docs:ych-patch-1 into main
pull from: ych/docs:ych-patch-1
merge into: devstar:main
Conversation 1 Commits - Files Changed -
ych commented 2025-12-06 14:12:24 +00:00
Collaborator
Copy Link

更改sharebuild-aosp14文档

更改sharebuild-aosp14文档
ych added 7 commits 2025-12-06 14:12:24 +00:00
更新 src/compile/sharebuild.md dcd05056db
更新 src/compile/sharebuild.md a490b98cba
初步整理的编译加速相关文档 3870b9720b
页面上的链接可以携带.md结尾，兼容网站模式和Git仓库Web模式
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details
e2b50e2188
Merge branch 'main' into mengning
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details
3638457aa6
更新 src/compile/why-distributed-compiling.md
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Failing after 3m2s
Details
d2e6ecbeba
更新 src/compile/sharebuild-aosp14.md
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details
855c9b0869
mengning added 1 commit 2025-12-07 06:39:52 +00:00
更新 src/compile/sharebuild-aosp14.md
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details
b1afa7d902
ych added 1 commit 2025-12-07 07:41:30 +00:00
更新 src/compile/sharebuild-aosp14.md
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details
39859809a5
mengning changed title from ych-patch-1 to 更改sharebuild-aosp14文档 2025-12-08 01:25:51 +00:00
mengning commented 2025-12-08 01:45:12 +00:00
Owner
Copy Link

此合并请求有变更与目标分支冲突，如果在同一个仓库中的不同分支大致的解决方法如下：

git checkout main
git pull
git checkout yourbranch
git merge main
# 解决冲突
git push
此合并请求有变更与目标分支冲突，如果在同一个仓库中的不同分支大致的解决方法如下： ``` git checkout main git pull git checkout yourbranch git merge main # 解决冲突 git push ```
mengning closed this pull request 2025-12-09 01:31:25 +00:00
Some checks failed
CI/CD Pipeline for mengning.com.cn / build (pull_request) Has been cancelled
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
alexios beppeb ccb devstar-gitee hwy init lat5211 mengning Noelle public ych zzy
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: devstar/docs#5
No description provided.
Delete Branch "ych/docs:ych-patch-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?