retorikal/harrowin-game
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Conflict Check #7

Open
harrowin wants to merge 0 commits from wawawawa-menganu-dialogic into OreFixDialogic
pull from: wawawawa-menganu-dialogic
merge into: retorikal:OreFixDialogic
Conversation 0 Commits - Files changed -
harrowin commented 2026-10-01 08:46:37 +07:00
Collaborator
Copy link
No description provided.
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin wawawawa-menganu-dialogic:wawawawa-menganu-dialogic
git switch wawawawa-menganu-dialogic

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 OreFixDialogic
git merge --no-ff wawawawa-menganu-dialogic
git switch wawawawa-menganu-dialogic
git rebase OreFixDialogic
git switch OreFixDialogic
git merge --ff-only wawawawa-menganu-dialogic
git switch wawawawa-menganu-dialogic
git rebase OreFixDialogic
git switch OreFixDialogic
git merge --no-ff wawawawa-menganu-dialogic
git switch OreFixDialogic
git merge --squash wawawawa-menganu-dialogic
git switch OreFixDialogic
git merge --ff-only wawawawa-menganu-dialogic
git switch OreFixDialogic
git merge wawawawa-menganu-dialogic
git push origin OreFixDialogic
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
retorikal/harrowin-game!7
No description provided.