> We had a Merge branch 'master' of github.com:pencil-code/pencil-code.

Should we maybe switch back to using SVN only?
Or at least for people who have no idea about how GIT works...?

> Thank you for forwarding the link about the "git commit".
> I always use the basic Git commands working with Pencil Code,
> $ git commit "particls_dust.f90"
> $ git pull
> $ git push

The problem is the: "git pull", which should be instead:
"git pull --rebase --autostash".

I guess this is written in Wolfgang's "GIT best practise" document?

Best greetings
Philippe.