test #1

Open

grigorevde wants to merge 21 commits from test into master

pull from: test

merge into: frontend:master

frontend:master

Conversation 0 Commits 21 Files changed 6 +177

grigorevde commented 2026-07-04 20:44:45 +00:00

Owner

Copy link

No description provided.

grigorevde self-assigned this 2026-07-04 20:44:45 +00:00

grigorevde added 1 commit 2026-07-04 20:44:45 +00:00

test 037412a496

grigorevde added 1 commit 2026-07-04 21:05:25 +00:00

Merge branch 'master' into test 29876c6eee

grigorevde force-pushed test from 29876c6eee to d090492b80 2026-07-04 22:33:02 +00:00 Compare

grigorevde force-pushed test from d090492b80 to 8406e3ba87 2026-07-04 23:03:30 +00:00 Compare

grigorevde force-pushed test from 8406e3ba87 to ce84426721 2026-07-04 23:05:57 +00:00 Compare

Some checks failed

Hide all checks

Проверка conf.typ / Компиляция conf.typ (pull_request) Failing after 4s

Details

This pull request has changes conflicting with the target branch.

• .forgejo/workflows/compile-conf.yml
• .forgejo/workflows/labs.yml
• .forgejo/workflows/release.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 into master

Merge commit body Reviewed-on: https://git.csit.sgu.ru/frontend/lab-template/pulls/1

Merge pull request 'test' (#1) from test into master Reviewed-on: https://git.csit.sgu.ru/frontend/lab-template/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:test

git switch test

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

git switch test

git rebase master

git switch master

git merge --ff-only test

git switch test

git rebase master

git switch master

git merge --no-ff test

git switch master

git merge --squash test

git switch master

git merge --ff-only test

git switch master

git merge test

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

grigorevde

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

frontend/lab-template!1

No description provided.