As for local devlopment: I just agree on the first default-config with everyone so we can leave the file alone.

Without this, you would have to manually edit the database.php (or database.php.sample) on each server after you deployed the app (which can be annoying if you ever change the password or add methods, properties, datasources, etc..). The above simply allows you to keep the database.php in your SCM and push updates without all the hassle.

Now to your question specificly:
No, there would still be conflicts after a developer clones the app AND changes the file (it’s in the SCM after all, whatever it is). The changes would affect everyone.

Best is to tell everybody how to name and password-protect their local database. That shouldn’t be an issue and in most prefab XAMP stacks it’s “root:root” anyway.

The trick explained here is aimed at server deployment. Local dev still requires a “agreement” between the people involved.

I’ve read the post from rafaelbandeira3, Chris Hartjes, and Neil Crookes and find it very interesting…

However, I’m very new to the different environments concept… Can you explain me like what would be the workflow in order to implement this? I mean, this is what I have in mind:

1 – A developer checks-out/clone the app.
2 – He/she will configure the “config” files to meet their environment (“dev”).
3 – He/she will only “check-in/push” features specific commits.
4 – Finally the SCM will not make updates to their environments configuration files…

Right? I’m sure I’m missing steps… I would appreciate if you can help me on this!

Thanks in advance!