Sunshine/mkxp-sunshine
Watch
9
0
Fork
You've already forked mkxp-sunshine
 4
Code Issues 24 Pull requests 1 Projects Releases Packages Wiki Activity Actions

master #191

Open
SodiumMoronite wants to merge 2 commits from SodiumMoronite/mkxp-sunshine-journal:master into master
pull from: SodiumMoronite/mkxp-sunshine-journal:master
merge into: Sunshine:master
Conversation 0 Commits 2 Files changed 1 +10 -13
SodiumMoronite commented 2026-10-28 23:18:44 +03:00
Contributor

свою же хуету фикшу

свою же хуету фикшу
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:SodiumMoronite-master"
git switch "SodiumMoronite-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 "SodiumMoronite-master"
git switch "SodiumMoronite-master"
git rebase "master"
git switch "master"
git merge --ff-only "SodiumMoronite-master"
git switch "SodiumMoronite-master"
git rebase "master"
git switch "master"
git merge --no-ff "SodiumMoronite-master"
git switch "master"
git merge --squash "SodiumMoronite-master"
git switch "master"
git merge --ff-only "SodiumMoronite-master"
git switch "master"
git merge "SodiumMoronite-master"
git push origin "master"
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
*BSD
  
*NIX
Linux

  
:3

   
Android

   
CMake

   
DepressedTWM долбаеб

   
HaikuOS

   
PS2

   
Performance issue

   
Vita

   
Windows
  
Арт
рисование

  
Баг

   
Документация

   
Карты

   
Кото-Окошко :3

   
Порты

   
Редактор

   
Чистота кода

   
блядь
No labels
*BSD
*NIX
Linux
:3
Android
CMake
DepressedTWM долбаеб
HaikuOS
PS2
Performance issue
Vita
Windows
Арт
рисование
Баг
Документация
Карты
Кото-Окошко :3
Порты
Редактор
Чистота кода
блядь
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.

Reference
Sunshine/mkxp-sunshine!191
No description provided.