https://stackoverflow.com/questions/2822391/accept-all-merge-conflicts-in-git
git add $(git ls-files --unmerged | cut -f2 | sort -u ;)
Permalink | 記事への反応(0) | 13:59
ツイートシェア