Add example app #3

Open

jan wants to merge 7 commits from feature/example-app into master

pull from: feature/example-app

merge into: jan:master

jan:master

Conversation 0 Commits 7 Files changed 16 +685 -114

jan commented 2023-05-12 18:16:51 +02:00

Owner

Copy link

No description provided.

jan force-pushed feature/example-app from 3d87b78c0b to 2a5882e8a4 2023-05-12 18:18:44 +02:00 Compare

jan added 1 commit 2023-05-12 18:23:04 +02:00

at least make sure the example builds 038e64eeab

All checks were successful

Hide all checks

ci/woodpecker/push/woodpecker Pipeline was successful

Details

ci/woodpecker/pr/woodpecker Pipeline was successful

Details

This pull request has changes conflicting with the target branch.

• .woodpecker.yml

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin feature/example-app:feature/example-app

git switch feature/example-app

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 master

git merge --no-ff feature/example-app

git switch feature/example-app

git rebase master

git switch master

git merge --ff-only feature/example-app

git switch feature/example-app

git rebase master

git switch master

git merge --no-ff feature/example-app

git switch master

git merge --squash feature/example-app

git switch master

git merge --ff-only feature/example-app

git switch master

git merge feature/example-app

git push origin master

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

Subscribe

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

jan/sdnotify!3

No description provided.