Skip to content

Commit

Permalink
Minor edits in dev.md (#420)
Browse files Browse the repository at this point in the history
  • Loading branch information
gnawin authored Jan 19, 2024
1 parent 1d680ca commit 29c71a0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions README.dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <branch_name>
```

### 6. Commit the Changes

When the test are passing, commit the changes and push them to the remote
Expand Down Expand Up @@ -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 <branch_name>
```
### 8. Create a Pull Request
When there are no more conflicts and all the test are passing, create a pull
Expand Down

0 comments on commit 29c71a0

Please sign in to comment.