Web Design Leaves

% git init my-project // Git で管理するディレクトリ（プロジェクト）を作成
Initialized empty Git repository in /.../my-project/.git/

% cd my-project  //作成したプロジェクトのディレクトリに移動

% tree .git  //.git ディレクトリの中身をツリー表示
.git
├── HEAD
├── config
├── description
├── hooks
│   ├  中略
│   └── update.sample
├── info
│   └── exclude
├── objects
│   ├── info
│   └── pack
└── refs
    ├── heads  // この時点では空
    └── tags

% cat .git/HEAD  // HEAD の内容を表示
ref: refs/heads/main

% touch foo.txt

% git add foo.txt

% git commit -m "first commit"
[main (root-commit) 2931804] first commit
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 foo.txt

% git log  // コミット履歴を確認
commit 2931804dad879ad2dc24006787b9e399ba63f4fc (HEAD -> main)
Author: foo <foo@example.com>
Date:   Fri Aug 11 10:09:39 2023 +0900

    first commit

% cat .git/HEAD
ref: refs/heads/main

% tree .git
.git
├── HEAD
├── ・・・中略・・・
└── refs
    ├── heads
    │   └── main  // 追加される
    └── tags

% cat .git/refs/heads/main
2931804dad879ad2dc24006787b9e399ba63f4fc  // コミットのハッシュ値

% echo hello git from foo! >> foo.txt

% git commit -a -m "text added to foo.txt"  // ステージングを省略してコミット
[main 6595577] text added to foo.txt
 1 file changed, 1 insertion(+)

% git log // コミット履歴を確認
commit 65955773eb9f32f979d0a7cfc32051d96766bf6c (HEAD -> main)
Author: foo <foo@example.com>
Date:   Fri Aug 11 10:32:27 2023 +0900

    text added to foo.txt

commit 2931804dad879ad2dc24006787b9e399ba63f4fc
Author: foo <foo@example.com>
Date:   Fri Aug 11 10:09:39 2023 +0900

    first commit

% cat .git/HEAD
ref: refs/heads/main

% cat .git/refs/heads/main
65955773eb9f32f979d0a7cfc32051d96766bf6c

% echo extra text >> foo.txt

% git commit -a -m "extra text added to foo.txt"
[main b1acd1b] extra text added to foo.txt
 1 file changed, 1 insertion(+)

% git log --oneline
b1acd1b (HEAD -> main) extra text added to foo.txt
6595577 text added to foo.txt
2931804 first commit

% git switch experiment // ブランチを切り替え
Switched to branch 'experiment'

% git status
On branch experiment  //現在 experiment ブランチにいる
nothing to commit, working tree clean

% git branch
* experiment  // カレントブランチ
  main

% git log --oneline -1
b1acd1b (HEAD -> experiment, main) extra text added to foo.txt

% cat .git/HEAD
ref: refs/heads/experiment

% git branch -d experiment
Deleted branch experiment (was 62d63f0).

% git log --oneline --graph --all
*   0be6f30 (HEAD -> main) Merge branch 'experiment' Integrate recent changes from the 'experiment' branch into the main branch.
|\
| * 62d63f0 additional text for bar.txt
| * 84c7ff1 bar.txt added at experiment branch
* | 38f218f goodbye added to foo.txt
|/
* b1acd1b extra text added to foo.txt
* 6595577 text added to foo.txt
* 2931804 first commit

% git branch  // 全てのブランチを表示
* main

% git branch -d test
error: The branch 'test' is not fully merged.
If you are sure you want to delete it, run 'git branch -D test'.

% mkdir project
% cd project
% echo this is foo. > foo.txt
% echo this is bar. > bar.txt
% git init  // プロジェクトを Git で初期化
Initialized empty Git repository in /.../project/.git/
% git add .
% git commit -m "Initial commit"  // 最初のコミット
[main (root-commit) 5c7d465] Initial commit
 2 files changed, 2 insertions(+)
 create mode 100644 bar.txt
 create mode 100644 foo.txt

% git switch -c development  // ブランチを作成して切り替え
Switched to a new branch 'development'

% git branch  // ブランチをリスト
* development  // 現在のブランチ
  main

% echo thi is baz. > baz.txt  // baz.txt を追加してコミット
% git add baz.txt
% git commit -m "baz.txt added for development"
[development 11fdd4f] baz.txt added for development
 1 file changed, 1 insertion(+)
 create mode 100644 baz.txt

% echo some text >> baz.txt  // baz.txt を変更してコミット
% git commit -a -m "text added to baz.txt for development"
 [development 08a38d2] text added to baz.txt for development
  1 file changed, 1 insertion(+)

% git log --oneline --all  // ログを表示
 08a38d2 (HEAD -> development) text added to baz.txt for development
 11fdd4f baz.txt added for development
 5c7d465 (main) Initial commit

git merge マージ元のブランチ名

% git switch main  // main に切り替え
Switched to branch 'main'

% ls   // ファイルを確認（development で追加した baz.txt はない）
bar.txt foo.txt

% git log --oneline --all
08a38d2 (development) text added to baz.txt for development
11fdd4f baz.txt added for development
5c7d465 (HEAD -> main) Initial commit  // HEAD は main を指している

% git branch
  development
* main  // 現在いるブランチ

% git merge development
Updating 5c7d465..08a38d2
Fast-forward  // Fast-forward マージと表示されている
 baz.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 baz.txt

% git status
On branch main
nothing to commit, working tree clean

% ls  // development で追加した baz.txt が取り込まれている
bar.txt baz.txt foo.txt

% git log --oneline --all
08a38d2 (HEAD -> main, development) text added to baz.txt for development
11fdd4f baz.txt added for development
5c7d465 Initial commit

% git branch -d development
Deleted branch development (was 08a38d2).

% git log --oneline --all --graph
* 08a38d2 (HEAD -> main) text added to baz.txt for development
* 11fdd4f baz.txt added for development
* 5c7d465 Initial commit

% mkdir greeting-project  // プロジェクトのディレクトリを作成
% cd greeting-project
% echo Hello! > hello.txt
% echo Goodbye! > goodbye.txt
% git init  // プロジェクトを Git で初期化
Initialized empty Git repository in /.../greeting-project/.git/
% git add .  // 全てのファイルをステージに追加
% git commit -m "Initial commit"  // 最初のコミット
[main (root-commit) 619c7cb] Initial commit
 2 files changed, 2 insertions(+)
 create mode 100644 goodbye.txt
 create mode 100644 hello.txt

% git switch -c feature  // ブランチを作成して切り替え
Switched to a new branch 'feature'

% git log --oneline // HEAD は feature と main を指している
619c7cb (HEAD -> feature, main) Initial commit

% git branch  // ブランチのリストを表示
* feature  // 現在いるブランチ
  main

% echo See You Soon! > see-you.txt  // see-you.txt を追加してコミット
% git add see-you.txt
% git commit -m "see-you.txt added at feature"
[feature a41ffa7] see-you.txt added at feature
 1 file changed, 1 insertion(+)
 create mode 100644 see-you.txt

% echo Thank You. > thanks.txt  // thanks.txt を追加してコミット
% git add thanks.txt
% git commit -m "thanks.txt added at feature"
 [feature d9d4c1e] thanks.txt added at feature
  1 file changed, 1 insertion(+)
  create mode 100644 thanks.txt

% git log --oneline --all  // 全てのブランチのログを表示
d9d4c1e (HEAD -> feature) thanks.txt added at feature // HEAD は featur を指している
a41ffa7 see-you.txt added at feature
619c7cb (main) Initial commit

% git switch main  // main に切り替え
Switched to branch 'main'

% git log --oneline
619c7cb (HEAD -> main) Initial commit // HEAD が main を指している

% git switch -c bugfix
Switched to a new branch 'bugfix'

% git log --oneline --all
d9d4c1e (feature) thanks.txt added at feature
a41ffa7 see-you.txt added at feature
619c7cb (HEAD -> bugfix, main) Initial commit // HEAD は bugfix と main を指している

% echo bug fixed >> hello.txt  // hello.txt に１行追加して問題修正とする

% git commit -a -m "bug fixed for hello.txt"
[bugfix d788715] bug fixed for hello.txt
 1 file changed, 1 insertion(+)

% git log --oneline --all
d788715 (HEAD -> bugfix) bug fixed for hello.txt
d9d4c1e (feature) thanks.txt added at feature
a41ffa7 see-you.txt added at feature
619c7cb (main) Initial commit

% git switch main // main に切り替え
Switched to branch 'main'

% git log --oneline --all
d788715 (bugfix) bug fixed for hello.txt
d9d4c1e (feature) thanks.txt added at feature
a41ffa7 see-you.txt added at feature
619c7cb (HEAD -> main) Initial commit // HEAD は main を指している

% git merge bugfix
Updating 619c7cb..d788715
Fast-forward  // Fast-forward マージ
 hello.txt | 1 +
 1 file changed, 1 insertion(+)

% git log --oneline --all
d788715 (HEAD -> main, bugfix) bug fixed for hello.txt
d9d4c1e (feature) thanks.txt added at feature
a41ffa7 see-you.txt added at feature
619c7cb Initial commit

% git branch -d bugfix  // bugfix ブランチを削除
Deleted branch bugfix (was d788715).

% git log --oneline --all --graph
* d788715 (HEAD -> main) bug fixed for hello.txt
| * d9d4c1e (feature) thanks.txt added at feature
| * a41ffa7 see-you.txt added at feature
|/
* 619c7cb Initial commit

% git switch feature // feature ブランチに切り替え
Switched to branch 'feature'

% echo Have a nice day! >> goodbye.txt

% git commit -a -m "text added for goodbye.txt"  // コミット
[feature cde9b14] text added for goodbye.txt
 1 file changed, 1 insertion(+)

 % git log --oneline --all --graph
 * cde9b14 (HEAD -> feature) text added for goodbye.txt
 * d9d4c1e thanks.txt added at feature
 * a41ffa7 see-you.txt added at feature
 | * d788715 (main) bug fixed for hello.txt
 |/
 * 619c7cb Initial commit

% git switch main
Switched to branch 'main'

% git log --oneline --all --graph
* cde9b14 (feature) text added for goodbye.txt
* d9d4c1e thanks.txt added at feature
* a41ffa7 see-you.txt added at feature
| * d788715 (HEAD -> main) bug fixed for hello.txt
|/
* 619c7cb Initial commit

% git merge feature 

Merge branch 'feature'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merge branch 'feature'
Integrate recent changes from the 'feature' branch into the main branch.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

~
~
-- INSERT --

% git merge feature //実行したコマンド（以下がそのレスポンス）
Merge made by the 'ort' strategy.
 goodbye.txt | 1 +
 see-you.txt | 1 +
 thanks.txt  | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 see-you.txt
 create mode 100644 thanks.txt

% git log --oneline --all --graph
*   b8db21e (HEAD -> main) Merge branch 'feature' Integrate recent changes from the 'feature' branch into the main branch. //マージコミットメッセージ
|\
| * cde9b14 (feature) text added for goodbye.txt
| * d9d4c1e thanks.txt added at feature
| * a41ffa7 see-you.txt added at feature
* | d788715 bug fixed for hello.txt
|/
* 619c7cb Initial commit

% git cat-file -p b8db21e
tree 7b17c87ba8e31b717460049466179d93c76805b6
parent d7887150e3c1dde672c2d7eec65130d2f9e812de  // 直接の親
parent cde9b14e30a368a483086bd2df5c199b34947e1c  // 直接の親
author foo <foo@example.com> 1692095462 +0900
committer foo <foo@example.com> 1692095462 +0900

Merge branch 'feature'
Integrate recent changes from the 'feature' branch into the main branch.

% git branch -d feature
Deleted branch feature (was cde9b14).

% git log --oneline --all --graph
*   b8db21e (HEAD -> main) Merge branch 'feature' Integrate recent changes from the 'feature' branch into the main branch.
|\
| * cde9b14 text added for goodbye.txt
| * d9d4c1e thanks.txt added at feature
| * a41ffa7 see-you.txt added at feature
* | d788715 bug fixed for hello.txt
|/
* 619c7cb Initial commit

% mkdir my-project2
% cd my-project2
% echo information > info.txt  //１行目にテキストを記述

% git init  // Git で初期化
Initialized empty Git repository in /.../my-project2/.git/
% git add info.txt
% git commit -m "Initial Commit"  // info.txt を追加（コミット）
[main (root-commit) bee9468] Initial Commit
 1 file changed, 1 insertion(+)
 create mode 100644 info.txt

% git log --oneline
bee9468 (HEAD -> main) Initial Commit

% git switch -c topic
Switched to a new branch 'topic'

% echo topic added >> info.txt
% git commit -a -m "topic added to info.txt"
[topic 6c0aa6e] topic added to info.txt
 1 file changed, 1 insertion(+)

% git switch main
Switched to branch 'main'

% echo additional text >> info.txt
% git commit -a -m "additional text added to info.txt"
[main b881b36] additional text added to info.txt
 1 file changed, 1 insertion(+)

% git merge topic  // main ブランチに topic ブランチでの変更をマージ
Auto-merging info.txt
CONFLICT (content): Merge conflict in info.txt  // info.txt でコンフリクト発生
Automatic merge failed; fix conflicts and then commit the result.
// 自動マージが失敗しました。競合している箇所を修正して、その結果をコミットしてください

information
<<<<<<< HEAD
additional text
=======
topic added
>>>>>>> topic

<<<<<<< HEAD
additional text
=======

=======
topic added
>>>>>>> topic

information
additional text
topic added

% git add info.txt  // 修正したファイルをステージに追加

% git status  // 状態を確認
On branch main
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge) // マージを完了するには git commit を実行

Changes to be committed:
        modified:   info.txt

% git commit -m "info.txtのコンフリクトを修正"
[main 6716e5f] info.txtのコンフリクトを修正

% git log --oneline --graph
*   6716e5f (HEAD -> main) info.txtのコンフリクトを修正
|\
| * 6c0aa6e (topic) topic added to info.txt
* | b881b36 additional text added to info.txt
|/
* bee9468 Initial Commit

% git init my-project3 // 空のディレクトリにリポジトリを作成（初期化）
Initialized empty Git repository in /.../my-project3/.git/
% cd my-project3
% echo sample text > sample.txt // ファイルを作成
% git add sample.txt
% git commit -m "Initial Commit"  //コミット（このコミットがベースコミットになる）
[main (root-commit) 21e0a65] Initial Commit
 1 file changed, 1 insertion(+)
 create mode 100644 sample.txt

% git log --oneline
21e0a65 (HEAD -> main) Initial Commit

% git switch -c feature  // feature というブランチを作成してそこへ切り替え
Switched to a new branch 'feature'

% git log --oneline
21e0a65 (HEAD -> feature, main) Initial Commit

% git branch
* feature
  main

% echo feature1 text > feature1.txt
% git add feature1.txt
% git commit -m "feature1.txt added"
[feature a9eb5d3] feature1.txt added
 1 file changed, 1 insertion(+)
 create mode 100644 feature1.txt
% echo additional text >> feature1.txt
% git commit -a -m "text added to feature1.txt"
[feature 09b9ab5] text added to feature1.txt
 1 file changed, 1 insertion(+)
% git log --oneline
09b9ab5 (HEAD -> feature) text added to feature1.txt
a9eb5d3 feature1.txt added
21e0a65 (main) Initial Commit

% git switch main
Switched to branch 'main'
% git log --oneline --all
09b9ab5 (feature) text added to feature1.txt
a9eb5d3 feature1.txt added
21e0a65 (HEAD -> main) Initial Commit

% echo abc >> sample.txt
% git commit -a -m "abc added to sample.txt"
[main bf182a7] abc added to sample.txt
 1 file changed, 1 insertion(+)

% echo 123 >> sample.txt
% git commit -a -m "123 added to sample.txt"
[main 15d748e] 123 added to sample.txt
 1 file changed, 1 insertion(+)

% git log --oneline
15d748e (HEAD -> main) 123 added to sample.txt
bf182a7 abc added to sample.txt
21e0a65 Initial Commit

% git log --oneline --all --graph
* 15d748e (HEAD -> main) 123 added to sample.txt
* bf182a7 abc added to sample.txt
| * 09b9ab5 (feature) text added to feature1.txt
| * a9eb5d3 feature1.txt added
|/
* 21e0a65 Initial Commit

// プロジェクトを作成して初期化
% git init my-project5
Initialized empty Git repository in /.../my-project5/.git/
% cd my-project5

// main ブランチでファイル abc.txt と xyz.txt を作成してコミット
% echo abc > abc.txt
% echo xyz > xyz.txt
% git add .
% git commit -m "Initial Commit"
[main (root-commit) df380d4] Initial Commit
 2 files changed, 2 insertions(+)
 create mode 100644 abc.txt
 create mode 100644 xyz.txt


// topic ブランチを作成して切り替え
% git switch -c topic
Switched to a new branch 'topic'

// topic ブランチで abc.txt を変更
% echo 123 >> abc.txt
% git commit -a -m "123 added to abc.txt"
[topic b73127d] 123 added to abc.txt
 1 file changed, 1 insertion(+)

// topic ブランチで xyz.txt を変更
% echo 456 >> xyz.txt
% git commit -a -m "456 added to xyz.txt"
[topic 23d7625] 456 added to xyz.txt
 1 file changed, 1 insertion(+)

// main ブランチに切り替え
% git switch main
Switched to branch 'main'

// main ブランチで abc.txt と xyz.txt を変更
% echo def >> abc.txt
% echo ghi >> xyz.txt
% git add .
% git commit -m "abc.txt and xyz.txt changed"
[main f0ee59a] abc.txt and xyz.txt changed
 2 files changed, 2 insertions(+)

% git log --oneline --all --graph  // ログを確認
* f0ee59a (HEAD -> main) abc.txt and xyz.txt changed
| * 23d7625 (topic) 456 added to xyz.txt
| * b73127d 123 added to abc.txt
|/
* df380d4 Initial Commit

% git switch topic
Switched to branch 'topic'

% git rebase main
Auto-merging abc.txt
CONFLICT (content): Merge conflict in abc.txt  // abc.txt でコンフリクト
error: could not apply b73127d... 123 added to abc.txt
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b73127d... 123 added to abc.txt

abc
<<<<<<< HEAD
def
=======
123
>>>>>>> b73127d (123 added to abc.txt)

abc
def
123

% git add abc.txt 

% git rebase --continue

123 added to abc.txt

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto f0ee59a
# Last command done (1 command done):
#    pick b73127d 123 added to abc.txt
# Next command to do (1 remaining command):
#    pick 23d7625 456 added to xyz.txt
# You are currently rebasing branch 'topic' on 'f0ee59a'.
#
# Changes to be committed:
#       modified:   abc.txt
#

123 and def  added to abc.txt

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto f0ee59a
# Last command done (1 command done):
#    pick b73127d 123 added to abc.txt
# Next command to do (1 remaining command):
#    pick 23d7625 456 added to xyz.txt
# You are currently rebasing branch 'topic' on 'f0ee59a'.
#
# Changes to be committed:
#       modified:   abc.txt
#

% git rebase --continue // 実行した git rebase --continue コマンドのレスポンス
[detached HEAD 9b3de67] 123 and def  added to abc.txt
 1 file changed, 4 insertions(+)
Auto-merging xyz.txt
CONFLICT (content): Merge conflict in xyz.txt  // xyz.txt でコンフリクト
error: could not apply 23d7625... 456 added to xyz.txt
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 23d7625... 456 added to xyz.txt

xyz
<<<<<<< HEAD
ghi
=======
456
>>>>>>> 23d7625 (456 added to xyz.txt)

xyz
ghi
456

% git add xyz.txt 

% git rebase --continue

% git rebase --continue
[detached HEAD 9329e72] 456 and ghi added to xyz.txt
 1 file changed, 1 insertion(+)
Successfully rebased and updated refs/heads/topic.

% git log --oneline --all --graph
* 9329e72 (HEAD -> topic) 456 and ghi added to xyz.txt
* 9b3de67 123 and def  added to abc.txt
* f0ee59a (main) abc.txt and xyz.txt changed
* df380d4 Initial Commit

% git merge topic
Auto-merging abc.txt
CONFLICT (content): Merge conflict in abc.txt  // コンフリクト
Auto-merging xyz.txt
CONFLICT (content): Merge conflict in xyz.txt  // コンフリクト
Automatic merge failed; fix conflicts and then commit the result.