Fix error: Your local changes to the following files would be overwritten by merge:
.babelrc
.dockerignore
.editorconfig
.env.production.sample
.gitignore
.rubocop.yml
.travis.yml
Capfile
Dockerfile
README.md
Vagrantfile
....
|
||
|---|---|---|
| .. | ||
| .fonctions | ||
| backup | ||
| install | ||
| remove | ||
| restore | ||
| upgrade | ||