I guess it will be very likely you are already using it but if not, I would suggest to use GIT folders directly in Databricks in conjunction with VS Code as you are doing now. There will be times in which is much faster/straightforward to run notebooks directly in databricks UI that you can synchronize later in VS Code. At least, this is my personal experience, obviously completely subjective 😀