floraachy
/
openTT
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

XXX2 #2

Open
floraachy wants to merge 6 commits from master into dev
pull from: master
merge into: floraachy:dev
Conversation 0 Commits 6 Files Changed 4 +242 -320
floraachy commented 2025-06-24 13:45:04 +08:00
Owner
Copy Link

SSSS

SSSS
floraachy added 2 commits 2025-06-24 13:45:05 +08:00
floraachy closed this pull request 2025-06-24 16:06:44 +08:00
floraachy reopened this pull request 2025-06-24 16:07:11 +08:00
floraachy added 2 commits 2025-06-24 16:15:42 +08:00
floraachy added 1 commit 2025-06-30 20:21:09 +08:00
This pull request has changes conflicting with the target branch.
  • settings.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 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: floraachy/openTT#2
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?