Installation: Support for editable installations of icedyno

docs/setup.md

@@ -20,6 +20,11 @@ To set up the automatic linters (that run every time you commit your work), you
 
 ![install_pre_commit](images/install_pre_commit.png)
 
+Finish the installation proces with:  
+```pixi run pip install -e .```
+
+If you skip this last step, you will **not** be able to import `icedyno` as an installed python library. 
+
 ## Testing the set up
 If you activated the pixi environment, type `pytest`. If not, type `pixi run pytest`. You should have one dummy test that runs on that command.
 

docs/workflow.md

@@ -1,3 +1,8 @@
 # IceDyno Dev Workflow
 
 This is where we should document how we should merge/rebase/squash/etc and things we should know while working.
+
+## Resolving rebase conflicts with pixi.lock
+You will only enounter this if you have added/removed dependencies and main has received commits since you first branched that included new/removed dependencies.
+
+If you encounter this, please make sure that the pixi.toml contains the (non-duplicated) additions from your commits and main's, then delete the pixi.lock and run `pixi install` to regnerate the lock file given both sets of dependencies.