Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
davidkastner committed Jul 2, 2023
1 parent d70a4a2 commit 493ccfc
Showing 1 changed file with 33 additions and 2 deletions.
35 changes: 33 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,47 @@ make html
## 5. Developer guide
### GitHub refresher for those who would like to contribute
### GitHub refresher
#### Push new changes
```bash
```
git status
git pull
git add -A .
git commit -m "Change a specific functionality"
git push -u origin main
```
#### Making a pull request
```
git checkout main
git pull
# Before you begin making changes, create a new branch
git checkout -b new-feature-branch
git add -A
git commit -m "Detailed commit message describing the changes"
git push -u origin new-feature-branch
# Visit github.com to add description, submit, merge the pull request
# Once finished on github.com, return to local
git checkout main
git pull
# Delete the remote branch
git branch -d new-feature-branch
```
#### Handle merge conflict
```
git stash push --include-untracked
git stash drop
git pull
```
### Copyright
Expand Down

0 comments on commit 493ccfc

Please sign in to comment.