do you have rules for using `git merge` you follow? what are they? (similar to these "rules for rebase" https://social.jvns.ca/@b0rk/111540871142309065)

so far my ideas are:

* merge `main` into your branch periodically so it it doesn't get too far behind
* something about avoiding "foxtrot" merges so that the first parent makes sense (https://blog.developer.atlassian.com/stop-foxtrots-now/)
* if you resolved a merge conflict wrong, undo it right away (?)