Help us understand the problem. What is going on with this article?

【自分用メモ】Git

More than 1 year has passed since last update.

特定のコミットまで戻る

$ git log //コミットidを探す
commit 5e76a65935a652f88f5280ad2ad10d7f3
Author: hoge <hoge@gmail.com>
Date:   Thu Feb 21 13:17:29 2019 +0900

    install redux

commit b1a50e1f2cd788e2960ec2c341f372110d2
Author: hoge <hoge@gmail.com>
Date:   Thu Feb 21 13:08:56 2019 +0900

    create application by create-react-app

commit e13b05391d054a72307bbe74183dcf02fc
Author: hoge <hoge@gmail.com>
Date:   Thu Feb 21 12:59:33 2019 +0900

    first commit

$ git reset --hard コミットid

ブランチ名変更

$ git branch -m 対象ブランチの名前 新しい名前

//現在いるブランチ名の変更
$ git branch -m 新しい名前

コンフリクトの解消

$ git fetch
$ git rebase -i origin/master
katsutakashima
えんじにあー
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away