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

changed return message #4

Open
mayelafo wants to merge 1 commit from mayelafo/2026-latam-git:the_fool into main
pull from: mayelafo/2026-latam-git:the_fool
merge into: ASPP:main
Conversation 0 Commits 1 Files changed 1 +2 -2
mayelafo commented 2026-07-27 21:31:58 +02:00
Member
Copy link

This is the simplest solution

This is the simplest solution
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 the_fool:mayelafo-the_fool
git switch mayelafo-the_fool

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 mayelafo-the_fool
git switch mayelafo-the_fool
git rebase main
git switch main
git merge --ff-only mayelafo-the_fool
git switch mayelafo-the_fool
git rebase main
git switch main
git merge --no-ff mayelafo-the_fool
git switch main
git merge --squash mayelafo-the_fool
git switch main
git merge --ff-only mayelafo-the_fool
git switch main
git merge mayelafo-the_fool
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!4
No description provided.