Closed alexandru-calinoiu closed 9 years ago
Hi @alexandru-calinoiu - do you have your code posted somewhere for us to take a look? A conflict file makes it seem like it's a git issue, but it's hard to know.
The repo is here https://github.com/alexandru-calinoiu/contact-service
Steps to reproduce:
rake db:migrate
In about 10s you will get a .env_conflict file ...
It actually seems to happen with all . (dot) files, I can reproduce it with .env
.rubocop.yml
Also not a git issue for sure it happened before I could get git init
to run.
On further investigation running any rake command including rake -T
will trigger the weird behaviour, napa commands seem to be fine.
No luck with this one, I've tried all I could think of and all my (dot) files keep reseting, even if they are commited.
I can't seem to reproduce somewhere else so I will leave it as it is for now
I am trying out a pilot project but I can't get past
rake db:migrate
my.env
file keeps getting overwritten and the old file gets stored in.env_conflict-20150910-220455