Skip to content

Commit

Permalink
correct Windows make comment (not avail in Git Bash by default)
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Jul 22, 2023
1 parent 1a56451 commit 4c0ed2d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ pytest -v build_makefiles.py

Note that `make` is required to test compiling MODFLOW 6 with makefiles. If `make` is not discovered on the system path, compile tests will be skipped.

On Windows, `make` is available by default in Git Bash. It is recommended to generate and test makefiles from a Unix-like shell like Git Bash rather than PowerShell or Command Prompt.
On Windows, it is recommended to generate and test makefiles from a Unix-like shell rather than PowerShell or Command Prompt. Make can be installed via Conda or Chocolatey. It is also included with mingw.

## Git Strategy for Managing Long-Lived Branches

Expand Down Expand Up @@ -511,4 +511,4 @@ Lastly, if you are satisfied with the results and confident the procedure went w
git branch -d feat-xyz-backup
```

This process can be repeated periodically to stay in sync with the develop branch and keep a clean commit history.
This process can be repeated periodically to stay in sync with the develop branch and keep a clean commit history.

0 comments on commit 4c0ed2d

Please sign in to comment.