SodiumMoronite/mkxp-sunshine-journal
Watch
1
0
Fork
You've already forked mkxp-sunshine-journal
 0
forked from Sunshine/mkxp-sunshine
Code Pull requests 1 Activity

master #1

Open
SodiumMoronite wants to merge 53 commits from Sunshine/mkxp-sunshine:master into master
pull from: Sunshine/mkxp-sunshine:master
merge into: SodiumMoronite:master
Conversation 0 Commits 53 Files changed 122 +3784 -14423
SodiumMoronite commented 2026-10-29 08:47:03 +03:00
Owner
No description provided. 
Reviewed-on: Sunshine/mkxp-sunshine#188
Reviewed-on: Sunshine/mkxp-sunshine#189
This pull request has changes conflicting with the target branch.
  • binding-mri/journal-binding.cpp
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 "master:Sunshine-master"
git switch "Sunshine-master"

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 "master"
git merge --no-ff "Sunshine-master"
git switch "Sunshine-master"
git rebase "master"
git switch "master"
git merge --ff-only "Sunshine-master"
git switch "Sunshine-master"
git rebase "master"
git switch "master"
git merge --no-ff "Sunshine-master"
git switch "master"
git merge --squash "Sunshine-master"
git switch "master"
git merge --ff-only "Sunshine-master"
git switch "master"
git merge "Sunshine-master"
git push origin "master"
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
5 participants
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
SodiumMoronite/mkxp-sunshine-journal!1
No description provided.