Pjotir/git-workshop
Watch
2
1
Fork
You've already forked git-workshop
 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

abhi_pull #2

Open
JARVIS wants to merge 3 commits from scenario2 into main
pull from: scenario2
merge into: Pjotir:main
Conversation 0 Commits 3 Files changed 1 +3
JARVIS commented 2026-11-13 20:11:26 +00:00
Collaborator
No description provided.
This pull request has changes conflicting with the target branch.
  • arithmetic.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 origin 'scenario2:scenario2'
git switch 'scenario2'

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 'scenario2'
git switch 'scenario2'
git rebase 'main'
git switch 'main'
git merge --ff-only 'scenario2'
git switch 'scenario2'
git rebase 'main'
git switch 'main'
git merge --no-ff 'scenario2'
git switch 'main'
git merge --squash 'scenario2'
git switch 'main'
git merge --ff-only 'scenario2'
git switch 'main'
git merge 'scenario2'
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
Pjotir/git-workshop!2
No description provided.