luoyi21a
/
reposync
forked from Lesin/reposync
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

. #10

Open
wngqi wants to merge 1 commits from wangqi_branch into master
pull from: wangqi_branch
merge into: luoyi21a:master
Conversation 0 Commits 1 Files Changed 7 +1051 -735
wngqi commented 2024-07-18 00:20:27 +08:00
Collaborator
Copy Link
No description provided.
wngqi added 1 commit 2024-07-18 00:20:28 +08:00
This pull request has changes conflicting with the target branch.
  • src/base/config.py
  • 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 wangqi_branch master
git pull origin wangqi_branch

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff wangqi_branch
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: luoyi21a/reposync#10
No description provided.
Delete Branch "wangqi_branch"

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?