deblan/deblan.io-murph
deblan/deblan.io-murph
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Wiki Activity

feature/surge #3

Open
deblan wants to merge 6 commits from feature/surge into develop
pull from: feature/surge
merge into: deblan:develop
Conversation 1 Commits 6 Files changed 2 +84 -63
deblan commented 2023-09-28 21:32:11 +02:00
Owner
Copy link
No description provided.
replace pipeline with steps
Some checks failed
ci/woodpecker/push/build Pipeline is pending
Details
ci/woodpecker/pr/build Pipeline failed
Details
fb5f5f5603
[wip] add phpmetrics on ci
Some checks failed
ci/woodpecker/push/build Pipeline is pending
Details
ci/woodpecker/pr/build Pipeline failed
Details
abe8c80faf
[wip] add phpmetrics on ci
Some checks failed
ci/woodpecker/push/build Pipeline is pending
Details
ci/woodpecker/pr/build Pipeline failed
Details
2f75204043
deblan commented 2023-09-28 21:38:15 +02:00
Author
Owner
Copy link

Deployment of preview was successful: https://deblan-deblan-io-murph-pr-3.surge.sh

<!--woodpeckerci-plugin-surge-preview--> Deployment of preview was successful: https://deblan-deblan-io-murph-pr-3.surge.sh
[wip] add phpmetrics on ci
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details
ci/woodpecker/pr/build Pipeline was successful
Details
22558c8501
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details
ci/woodpecker/pr/build Pipeline was successful
Details
This pull request has changes conflicting with the target branch.
  • .woodpecker/build.yml
  • .woodpecker/deploy.yml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/surge:feature/surge
git switch feature/surge

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 switch develop
git merge --no-ff feature/surge
git switch feature/surge
git rebase develop
git switch develop
git merge --ff-only feature/surge
git switch feature/surge
git rebase develop
git switch develop
git merge --no-ff feature/surge
git switch develop
git merge --squash feature/surge
git switch develop
git merge --ff-only feature/surge
git switch develop
git merge feature/surge
git push origin develop
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
deblan/deblan.io-murph!3
No description provided.