CONFLICT (content): Merge conflict in db/development.sqlite3 のエラー
git rm db/*.sqlite3 git commit -m "Removing SQLite files from git" rm .gitignore wget https://raw.githubusercontent.com/github/gitignore/master/Rails.gitignore mv Rails.gitignore .gitignore git add .gitignore git commit -m "Ignoring files that Rails recommends"
備忘録