Chtinux/site
5
3
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

WIP:Release #1

Draft
aeddis wants to merge 5 commits from pre-prod into main
pull from: pre-prod
merge into: Chtinux:main
Conversation 0 Commits 5 Files changed 1 +29
aeddis commented 2024-06-01 17:53:43 +00:00
Owner
Copy link
No description provided.
aeddis added 1 commit 2024-06-01 17:53:43 +00:00
woodpecker init
All checks were successful
ci/woodpecker/manual/woodpecker Pipeline was successful
Details
3c9db21a43
aeddis added 1 commit 2024-06-01 17:58:24 +00:00
remove static/
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
ci/woodpecker/manual/woodpecker Pipeline was successful
Details
7c4c4ee858
aeddis added 1 commit 2024-12-13 21:39:55 +00:00
aeddis added 1 commit 2024-12-13 21:40:58 +00:00
aeddis added 1 commit 2024-12-13 21:45:29 +00:00
rollback .woodpecker.yaml
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
ci/woodpecker/push/woodpecker Pipeline was successful
Details
10702c0244
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
ci/woodpecker/push/woodpecker Pipeline was successful
Details
This pull request has changes conflicting with the target branch.
  • .woodpecker.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin pre-prod:pre-prod
git checkout pre-prod

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff pre-prod
git checkout pre-prod
git rebase main
git checkout main
git merge --ff-only pre-prod
git checkout pre-prod
git rebase main
git checkout main
git merge --no-ff pre-prod
git checkout main
git merge --squash pre-prod
git checkout main
git merge --ff-only pre-prod
git checkout main
git merge pre-prod
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: Chtinux/site#1
No description provided.
Delete branch "pre-prod"

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?