Lesin
/
reposync
0
0
Fork 56
Code Issues Pull Requests 28 Packages Projects Releases 1 Wiki Activity

双向合并测试 #21

Open
fufeng_1003 wants to merge 38 commits from fufeng_1003/reposync:pr-test into master
pull from: fufeng_1003/reposync:pr-test
merge into: Lesin:master
Conversation 0 Commits 38 Files Changed 49375 +4939435 -635
fufeng_1003 commented 2025-07-07 09:35:21 +08:00
First-time contributor
Copy Link

双向合并测试

双向合并测试
fufeng_1003 added 36 commits 2025-07-07 09:35:26 +08:00
98deebf9cd Merge branch 'master' of https://gitlink.org.cn/qinxinqi/reposync into huaijin 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
0e7d21f6b0 1.修复了原本gitlink到gitee更新和创建没有description的bug 
2.还缺乏双向同步
3.由于github连不上，部分功能的bug没有修复，也没有测试
4.教员说最好有一个菜单界面
b61668de85 1.实现了issue状态的同步 
2.实现了双向同步
3.实现了web界面同步并在dockerfile中启动，在8002端口。其余一些问题也进行了修复，这一模块已经固定了
5f53b02e12 dockerfile：移除IUS仓库依赖 - 避免第三方仓库的包名和可用性问题 
使用CentOS默认仓库 - 更可靠稳定
简化安装命令 - 直接安装 openssh-server 和 git
fufeng_1003 added 2 commits 2025-07-07 10:17:49 +08:00
This pull request has changes conflicting with the target branch.
  • README.md
  • src/service/cronjob.py
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b fufeng_1003-pr-test master
git pull pr-test

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff fufeng_1003-pr-test
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Lesin/reposync#21
No description provided.
Delete Branch "fufeng_1003/reposync:pr-test"

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?