115
92

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 5 years have passed since last update.

自分のいるブランチが他の人によってforce-pushされたとき,カレントブランチを削除せずに変更を取り込む

Posted at

例えばレビュー中に小さなバグを見付けたので,レビュイーにpush -fしてもらった後にその変更を手元に持ってくるにはどうすればよいか.歴史が変わっているのでgit pullはできない.
今までは以下のように別ブランチに移動&削除&再度ブランチ作成していた.

# someone force-pushed to `topic` branch
git co master
git branch -D topic
git fetch
git co topic # creates `topic` branch from `origin/topic`

しかし,わざわざ移動&削除しなくとも以下のようにreset --hardすればよい

git fetch
git reset --hard origin/topic

thanks to @uasi!

115
92
2

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
115
92

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?