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

[WIP] GIT 基本操作

Last updated at Posted at 2021-08-28

概要

GITの基本操作について纏めます。

ブランチ元のソースをブランチ先に取り込む

  1. git checkout ブランチ元
  2. git fetch
  3. git pull origin ブランチ元
  4. git checkout ブランチ先
  5. git merge ブランチ元
  6. ※コンフリクトした場合
    1. 修正
    2. git add 対象ファイル
    3. git commit
    4. git push origin ブランチ先

修正ファイルを一旦置き最新コードを取得。再度修正ファイルを取り込む

  1. git stash
  2. git pull origin ブランチ元
  3. git stash pop
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?