From 29c71a08a1323876e0d2ab85b406f3c94b8f6b45 Mon Sep 17 00:00:00 2001 From: Ni Wang <125902905+gnawin@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:47:37 +0100 Subject: [PATCH] Minor edits in dev.md (#420) --- README.dev.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.dev.md b/README.dev.md index 86586510..2fcec1ef 100644 --- a/README.dev.md +++ b/README.dev.md @@ -253,12 +253,6 @@ pre-commit run -a If any of the checks failed, find in the pre-commit log what the issues are and fix them. Then, add them again (`git add`), rerun the tests & linter, and commit. -```bash -git status # Another way to show that all conflicts are fixed. -git rebase --continue -git push --force myfork -``` - ### 6. Commit the Changes When the test are passing, commit the changes and push them to the remote @@ -309,6 +303,12 @@ git diff --staged # Another way to check changes, i.e., what you will see in Once the conflicts are resolved, commit and push. +```bash +git status # Another way to show that all conflicts are fixed. +git rebase --continue +git push --force myfork +``` + ### 8. Create a Pull Request When there are no more conflicts and all the test are passing, create a pull