homework1 #2

Open

jairovi wants to merge 3 commits from jairovi/2026-latam-git:problem1 into main

pull from: jairovi/2026-latam-git:problem1

merge into: ASPP:main

ASPP:main

ASPP:feature-disk

ASPP:materials

Conversation 2 Commits 3 Files changed 1 +2 -2

jairovi commented 2026-07-27 21:26:33 +02:00

Member

Copy link

We did our best xD

We did our best xD

jairovi added 1 commit 2026-07-27 21:26:33 +02:00

homework1 4222fecc61

otizonaizit requested changes 2026-07-27 21:47:20 +02:00

otizonaizit left a comment

Copy link

but the error strings still differ, the hacker will know!

but the error strings still differ, the hacker will know!

jairovi added 1 commit 2026-07-27 23:31:45 +02:00

fixing error 36c84bffa0

zbyszek approved these changes 2026-07-27 23:44:46 +02:00

zbyszek left a comment

Copy link

Oh, now the message match

Oh, now the message match

jairovi added 1 commit 2026-07-27 23:46:25 +02:00

smallchange 2a671702b8

This pull request has changes conflicting with the target branch.

• auth.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'homework1' (#2) from jairovi/2026-latam-git:problem1 into main

Merge commit body Reviewed-on: https://git.aspp.school/ASPP/2026-latam-git/pulls/2 Reviewed-by: Zbigniew Jędrzejewski-Szmek <zbyszek@noreply.localhost>

Merge pull request 'homework1' (#2) from jairovi/2026-latam-git:problem1 into main Reviewed-on: https://git.aspp.school/ASPP/2026-latam-git/pulls/2 Reviewed-by: Zbigniew Jędrzejewski-Szmek <zbyszek@noreply.localhost> Copy merge commit message

Checkout

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

git fetch -u problem1:jairovi-problem1

git switch jairovi-problem1

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 main

git merge --no-ff jairovi-problem1

git switch jairovi-problem1

git rebase main

git switch main

git merge --ff-only jairovi-problem1

git switch jairovi-problem1

git rebase main

git switch main

git merge --no-ff jairovi-problem1

git switch main

git merge --squash jairovi-problem1

git switch main

git merge --ff-only jairovi-problem1

git switch main

git merge jairovi-problem1

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

otizonaizit

zbyszek

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

3 participants

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

ASPP/2026-latam-git!2

No description provided.