wanrenqi
/
PASII
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

去掉output #1

Open
zengyun wants to merge 1 commits from zengyun/PASII:yun into main
pull from: zengyun/PASII:yun
merge into: wanrenqi:main
Conversation 0 Commits 1 Files Changed 265 -4635
zengyun commented 2025-06-20 15:00:29 +08:00
Collaborator
Copy Link
No description provided.
zengyun added 1 commit 2025-06-20 15:00:44 +08:00
This pull request has changes conflicting with the target branch.
  • CandeII_1.4/User/KEIL/Output/Syd8811_Peripheral.map
  • CandeII_1.4/User/KEIL/Output/Syd8811_Peripheral_Syd8811_Peripheral.dep
  • CandeII_1.4/User/KEIL/Output/app_adc.crf
  • CandeII_1.4/User/KEIL/Output/app_gpio.crf
  • CandeII_1.4/User/KEIL/Output/debug.crf
  • CandeII_1.4/User/KEIL/Output/gpadc.crf
  • CandeII_1.4/User/KEIL/Output/isr.crf
  • CandeII_1.4/User/KEIL/Output/lis2dh.crf
  • CandeII_1.4/User/KEIL/Output/lsm6d.crf
  • CandeII_1.4/User/KEIL/Output/main.crf
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 zengyun-yun main
git pull yun

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff zengyun-yun
git push origin main
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: wanrenqi/PASII#1
No description provided.
Delete Branch "zengyun/PASII:yun"

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?