たれみみマンデー

2021-11-01から1ヶ月間の記事一覧

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 …

bundle i でffiがインストールできないエラー

An error occurred while installing ffi (1.15.4), and Bundler cannot continue. Make sure that `gem install ffi -v '1.15.4' --source 'https://rubygems.org/'` succeeds before bundling. brew link --force libffi で出てくる export LDFLAGS="-L/us…