To avoid spurious merge commits use a rebase workflow when appropriate.
...
...
@@ -18,6 +18,12 @@ git fetch origin
git rebase origin/main
```
To update the feature branch on GitHub you then need to do a forced push. Instead of `--force` use `--force-with-lease`. If someone have made changes to the branch that you do not have locally you get a warning. It is a good habit to always use `--force-with-lease`. One day it will save you from a bad mistake.
```shell
git push --force-with-lease
```
## Postgres snapshots/restore
Hypha dev requirements contain the [dslr](https://github.com/mixxorz/DSLR) tool. Use this for fast snapshots and restores of the postgres database.
...
...
@@ -68,3 +74,58 @@ If you editor does not a Language Server Protocol (LSP) preinstalled make sure t
Your editor most likely have plugins for the other languages Hypha uses as well, css/scss, yaml and html. We recoment to install them as well.
## Shell configuration
In the shell you can press the up arrow to see earlier (history) commands. It is possible to bind this to history search.
You can then e.g. write `git` and then press the upp arrow and see the commands from your history that start with `git`. So useful and intuitive that it should be the default.