From 45d722e6b061851cc2c40700ad7a3f9bb9d0c6a2 Mon Sep 17 00:00:00 2001 From: Exverge Date: Sat, 30 Mar 2024 01:31:13 +0100 Subject: [PATCH] Well now it is. --- Typical-Git-Workflow.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index 5c2f333..0caa3ec 100644 --- a/Typical-Git-Workflow.md +++ b/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.