yovinchen
/
xlcs
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

master #3

Open
yovinchen wants to merge 4 commits from master into dev
pull from: master
merge into: yovinchen:dev
Conversation 0 Commits 4 Files Changed 1 +29
yovinchen commented 2024-06-05 16:16:14 +08:00
Owner
Copy Link

项目二阶段完成，合并主分支

项目二阶段完成，合并主分支
yovinchen added 4 commits 2024-06-05 16:16:14 +08:00
cbc0eea5e7 Reapply "撤销提交重新推送" 
This reverts commit 64b65acefff9607d2b9a670db18677ece0111eec.
This pull request has changes conflicting with the target branch.
  • README.md
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 master dev
git pull origin master

Step 2:

Merge the changes and update on Gitea.
git checkout dev
git merge --no-ff master
git push origin dev
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: yovinchen/xlcs#3
No description provided.
Delete Branch "master"

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?