mich/av-asg

Fork 0

dev2 #1

Open

mich wants to merge 4 commits from dev2 into dev

mich commented

2024-09-11 08:08:12 +00:00

Owner

No description provided.

mich added 4 commits

2024-09-11 08:08:12 +00:00

Update Docker-Compose.yaml b49e4a555c

Update Docker-Compose.yaml 197e423272

Update Docker-Compose.yaml 38ae9d375b

add password from env c1c5490deb

This pull request has changes conflicting with the target branch.

Docker-Compose.yaml
asgweb/gui/login.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'dev2' (#1) from dev2 into dev

Merge commit body

Reviewed-on: https://git.m1ch.eu/mich/av-asg/pulls/1

Merge pull request 'dev2' (#1) from dev2 into dev

Reviewed-on: https://git.m1ch.eu/mich/av-asg/pulls/1

Checkout

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

git fetch -u origin dev2:dev2

git switch dev2

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 dev

git merge --no-ff dev2

git switch dev2

git rebase dev

git switch dev

git merge --ff-only dev2

git switch dev2

git rebase dev

git switch dev

git merge --no-ff dev2

git switch dev

git merge --squash dev2

git switch dev

git merge --ff-only dev2

git switch dev

git merge dev2

git push origin dev

No reviewers

No labels

No milestone

No project

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

mich/av-asg!1

No description provided.

Rows
Columns