Skip to content

Commit

Permalink
describe conda + git bash integration
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Jul 22, 2023
1 parent 4c0ed2d commit 884676c
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,20 @@ Note that `make` is required to test compiling MODFLOW 6 with makefiles. If `mak

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.

To make Conda commands available from Git Bash on Windows, run the `conda.sh` script located in your Conda installation's `/etc/profile.d` subdirectory. For instance, with Anaconda3:

```shell
. /c/Anaconda3/etc/profile.d/conda.sh
```

Or Miniconda3:

```shell
. /c/ProgramData/miniconda3/etc/profile.d/conda.sh
```

This command may be added to a `.bashrc` or `.bash_profile` in your home directory to make Conda available from subsequent sessions.

## Git Strategy for Managing Long-Lived Branches

When a feature branch takes a long time to develop, it is easy to become out of sync with the develop branch. Depending on the situation, it may be advisable to periodically squash the commits on the feature branch and rebase the change set with develop. The following approach for updating a long-lived feature branch has proven robust.
Expand Down

0 comments on commit 884676c

Please sign in to comment.