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

solving the problem #14

Open
isaacga wants to merge 1 commit from isaacga/2026-latam-git:solving_problem into main
pull from: isaacga/2026-latam-git:solving_problem
merge into: ASPP:main
Conversation 0 Commits 1 Files changed 1 +2 -4
isaacga commented 2026-07-27 23:50:59 +02:00
Member
Copy link

We triying solve the first problem

We triying solve the first problem
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 solving_problem:isaacga-solving_problem
git switch isaacga-solving_problem

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 isaacga-solving_problem
git switch isaacga-solving_problem
git rebase main
git switch main
git merge --ff-only isaacga-solving_problem
git switch isaacga-solving_problem
git rebase main
git switch main
git merge --no-ff isaacga-solving_problem
git switch main
git merge --squash isaacga-solving_problem
git switch main
git merge --ff-only isaacga-solving_problem
git switch main
git merge isaacga-solving_problem
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!14
No description provided.