0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 1 year has passed since last update.

コンフリクトファイルの一括解決 片側に合わせる in Powershell

Posted at

コンフリクトがたくさん発生したときに、mergeでもってくるブランチに合わせる場合。

git diff --name-only --diff-filter=U --relative | %{git checkout --theirs $_}

git diff でコンフリクトファイル一覧を出し、
%{ $_}でその出力を xargsライクに次のコマンドの入力としている。

0
0
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?