yuan/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2025-08-07 21:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Well now it is.

Exverge 2024-03-30 01:31:13 +01:00
parent 7a1749c9ac
commit 45d722e6b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Typical-Git-Workflow.md

@ -80,5 +80,5 @@ To append changes to the most recently made commit, simply perform the following
2. Update `origin/new-branch-name`
* `git push origin new-branch-name --force`
3. Merge your branch in
* Always merge using the >merge< button in the GitHub pull request
* If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #suyu-emu on [libera](https://web.libera.chat) or @ #suyu-general on [Discord](https://discord.gg/suyu). Mastering Git is not as easy as it might sound, but we'll happily help you get started.
* Always merge using the >merge< button in thepull request
* If Forgejo says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #suyu-emu on [libera](https://web.libera.chat) or @ #suyu-general on [Discord](https://discord.gg/suyu). Mastering Git is not as easy as it might sound, but we'll happily help you get started.