ASPP/2026-latam-git
0
0
Fork 15
Code Issues Pull requests 14 Projects Releases Packages Wiki Activity Actions

generic error #6

Open
oswaldoad wants to merge 1 commit from oswaldoad/2026-latam-git_osw:featur-ex1 into main
pull from: oswaldoad/2026-latam-git_osw:featur-ex1
merge into: ASPP:main
Conversation 0 Commits 1 Files changed 1 +3 -3
oswaldoad commented 2026-07-27 21:52:47 +02:00
Member
Copy link

we made a generic error avert so we do not disclose corrrect usernames

we made a generic error avert so we do not disclose corrrect usernames
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.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u featur-ex1:oswaldoad-featur-ex1
git switch oswaldoad-featur-ex1

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 oswaldoad-featur-ex1
git switch oswaldoad-featur-ex1
git rebase main
git switch main
git merge --ff-only oswaldoad-featur-ex1
git switch oswaldoad-featur-ex1
git rebase main
git switch main
git merge --no-ff oswaldoad-featur-ex1
git switch main
git merge --squash oswaldoad-featur-ex1
git switch main
git merge --ff-only oswaldoad-featur-ex1
git switch main
git merge oswaldoad-featur-ex1
git push origin main
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
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!6
No description provided.