LoginSignup
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?

@keita07029

コンフリクト発生時の対応コマンド

Posted at

コンフリクト発生時の状況確認

①git status➡コンフリクトが発生したファイルが表示されます。

②コンフリクト箇所を手動で修正

③git add <ファイル名>➡解消済みをGitに伝える

④git rebase --continue➡リベースを再開

※リベースを再開する場合はgit rebase --abortコマンドを使用。

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
Sign upLogin
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?