orga0063
/
autumnn1
4
0
Fork 1
Code Issues Pull Requests 3 Projects Releases 1 Wiki Activity

okoko #5

Open
p53209761 wants to merge 2 commits from ymla into cmdb
pull from: ymla
merge into: orga0063:cmdb
Conversation 0 Commits 2 Files Changed 2 +8 -5
p53209761 commented 2022-10-19 17:01:28 +08:00
Owner
Copy Link

okoko

okoko
p53209761 added 1 commit 2022-10-19 17:01:28 +08:00
p53209761 added 1 commit 2022-10-19 17:02:37 +08:00
This pull request has changes conflicting with the target branch.
  • test.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 ymla cmdb
git pull origin ymla

Step 2:

Merge the changes and update on Gitea.
git checkout cmdb
git merge --no-ff ymla
git push origin cmdb
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: orga0063/autumnn1#5
No description provided.
Delete Branch "ymla"

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?