※本家はこちら
hoge.md が競合した場合に自分の変更を適応する方法
$git checkout --ours hoge.md
$git add hoge.md
ちなみに相手側を適応する場合は
$git checkout --theirs hoge.md
$git add hoge.md
More than 5 years have 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
List of users who liked
22