mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity

DONE: Bug562-Wuyichen #132

Open
wuyichen wants to merge 2 commits from Bug562-Wuyichen into Alpha-snapshot20240618
pull from: Bug562-Wuyichen
merge into: mrlan:Alpha-snapshot20240618
Conversation 0 Commits 2 Files Changed 7
wuyichen commented 2024-06-02 18:57:27 +08:00
There is no content yet.
wuyichen added 3 commits 2024-06-02 18:57:28 +08:00
mrlan changed title from Bug562-Wuyichen to Bug562-Wuyichen 2024-06-25 07:23:34 +08:00
mrlan changed target branch from Alpha-snapshot20230621 to Alpha-snapshot20230621OK 2024-06-25 07:23:34 +08:00
mrlan changed title from Bug562-Wuyichen to DONE: Bug562-Wuyichen 2024-06-25 08:08:42 +08:00
mrlan changed title from DONE: Bug562-Wuyichen to DONE: Bug562-Wuyichen 2024-09-02 14:32:18 +08:00
mrlan changed target branch from Alpha-snapshot20230621OK to Alpha-snapshot20240618 2024-09-02 14:32:19 +08:00
This pull request has changes conflicting with the target branch.
  • app/main.py
  • app/templates/userpage_get.html
  • requirements.txt
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 Bug562-Wuyichen Alpha-snapshot20240618
git pull origin Bug562-Wuyichen

Step 2:

Merge the changes and update on Gitea.
git checkout Alpha-snapshot20240618
git merge --no-ff Bug562-Wuyichen
git push origin Alpha-snapshot20240618
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: mrlan/EnglishPal#132
There is no content yet.
Delete Branch "Bug562-Wuyichen"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?