From 627fd5e76dd76c7f50b485e96ed4f9b47a77edd1 Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 30 Oct 2023 13:37:03 +0100 Subject: [PATCH] Added Getting Started to README --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 0e3d994..49560bf 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,14 @@ You will then see a prompt, please fill it out like outlined below: 1. `git add ` your changes 2. Execute `nix fmt` to lint your files 3. `git commit -a -m "My descriptive commit message"` + 4. Make sure your branch has the latest changes from upstream by executing: + ```bash + git fetch && git rebase origin/main --autostash + ``` + 5. Execute `git status` to see if you have a merge conflict. + 6. If so edit the file and fix the conflict. Here is a tutorial how to do so in [vscode](https://code.visualstudio.com/docs/sourcecontrol/overview#_merge-conflicts) + 7. Execute `git merge --continue` and repeat step 5 till there are no conflicts anymore + 3. To automatically open up a pull request, that gets merged if all tests pass execute: ```bash