メモ代わりに残します。
A to B でマージする場合に deleted by them が発生したけど追加したい場合、
一度 rm --cached して add してあげれば良い。
git checkout B
git merge A
#=> deleted by theme: hoge_file
git rm --cached hoge_file
git add hoge_file
#=> new file: hoge_file
More than 1 year has passed since last update.
Register as a new user and use Qiita more conveniently
- You get articles that match your needs
- You can efficiently read back useful information
- You can use dark theme