Open-CT
/
OpenPBL
1
0
Fork 1
Code Issues Pull Requests 3 Projects Releases Wiki Activity

add some components 2 #4

Open
binary wants to merge 1 commits from binary/OpenPBL:pr3 into master
pull from: binary/OpenPBL:pr3
merge into: Open-CT:master
Conversation 0 Commits 1 Files Changed 174 +3262 -27589
binary commented 2022-08-16 23:34:07 +08:00
Contributor
Copy Link
No description provided.
binary added 1 commit 2022-08-16 23:34:07 +08:00
This pull request has changes conflicting with the target branch.
  • web/src/App.less
  • web/src/MaterialWarehouse.js
  • web/src/MaterialWarehouse.less
  • web/craco.config.js
  • web/package.json
  • web/public/manifest.json
  • web/src/App.js
  • web/.gitignore
  • web/README.md
  • web/public/index.html
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 binary-pr3 master
git pull pr3

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff binary-pr3
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: Open-CT/OpenPBL#4
No description provided.
Delete Branch "binary/OpenPBL:pr3"

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?