test #1

Open

tarmaciltur wants to merge 2 commits from test-flatpak-repo-init-action into master

pull from: test-flatpak-repo-init-action

merge into: tarmaciltur:master

tarmaciltur:master

tarmaciltur:test-flatpak-bundle-action

tarmaciltur:test-flatpak-build-action

tarmaciltur:124-fix_expander_rows_nested_in_camera_settings

tarmaciltur:adds-camera-state

tarmaciltur:stable

Conversation 0 Commits 2 Files changed 2 +22 -14

tarmaciltur commented 2026-05-25 12:59:51 -03:00

Owner

Copy link

No description provided.

tarmaciltur added 1 commit 2026-05-25 12:59:51 -03:00

test cab74403b3

tarmaciltur added 1 commit 2026-05-25 13:02:27 -03:00

test 24aa0fe729

All checks were successful

Hide all checks

Flatpak Build and Publish / flatpak-repo-init (push) Successful in 24s

Details

Flatpak Build and Publish / flatpak-builder-arm64 (push) Successful in 2m24s

Details

Flatpak Build and Publish / flatpak-builder-x86_64 (push) Successful in 12m5s

Details

Flatpak Build and Publish / flatpak-bundle (push) Successful in 20s

Details

Flatpak Build and Publish / flatpak-repo-pages (push) Has been skipped

Details

This pull request has changes conflicting with the target branch.

• .forgejo/workflows/flatpak.yml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'test' (#1) from test-flatpak-repo-init-action into master

Merge commit body Reviewed-on: https://softwareperonista.com.ar/tarmaciltur/vigilantear/pulls/1

Merge pull request 'test' (#1) from test-flatpak-repo-init-action into master Reviewed-on: https://softwareperonista.com.ar/tarmaciltur/vigilantear/pulls/1 Copy merge commit message

Checkout

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

git fetch -u origin test-flatpak-repo-init-action:test-flatpak-repo-init-action

git switch test-flatpak-repo-init-action

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 test-flatpak-repo-init-action

git switch test-flatpak-repo-init-action

git rebase master

git switch master

git merge --ff-only test-flatpak-repo-init-action

git switch test-flatpak-repo-init-action

git rebase master

git switch master

git merge --no-ff test-flatpak-repo-init-action

git switch master

git merge --squash test-flatpak-repo-init-action

git switch master

git merge --ff-only test-flatpak-repo-init-action

git switch master

git merge test-flatpak-repo-init-action

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

tarmaciltur/vigilantear!1

No description provided.