git rebase 실습 코드

(forcrawling) ~/weplay/weplay   master
 ls
README.md definitely.csv yamaha.py
1
(forcrawling) ~/weplay/weplay   master
 git branch bingo/12
(forcrawling) ~/weplay/weplay   master
 git checktou bingo/12
git: 'checktou' is not a git command. See 'git --help'.

The most similar command is
checkout
(forcrawling) ✘  ~/weplay/weplay   master
 git checkout bingo/12
Switched to branch 'bingo/12'
(forcrawling) ~/weplay/weplay   bingo/12
 ls
README.md definitely.csv yamaha.py
(forcrawling) ~/weplay/weplay   bingo/12
 vi README.md
(forcrawling) ~/weplay/weplay   bingo/12 ●
 git status
On branch bingo/12
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
(forcrawling) ~/weplay/weplay   bingo/12 ●
 vi 12.md
(forcrawling) ~/weplay/weplay   bingo/12 ●
 ls
12.md README.md definitely.csv yamaha.py
(forcrawling) ~/weplay/weplay   bingo/12 ●
 git status
On branch bingo/12
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified:   README.md

Untracked files:
(use "git add ..." to include in what will be committed)

12.md

no changes added to commit (use "git add" and/or "git commit -a")
(forcrawling) ~/weplay/weplay   bingo/12 ●
 git add .
(forcrawling) ~/weplay/weplay   bingo/12 ✚
 git commit -m
error: switch `m' requires a value
(forcrawling) ✘  ~/weplay/weplay   bingo/12 ✚
1 👏🏻 👏🏻 👏🏻 👏🏻 👏🏻 WePlay 👏🏻 👏🏻 👏🏻 👏🏻 👏🏻
 git commit -m "12번 빙고 완료"
[bingo/12 c63ab65] 12번 빙고 완료
1
Committer: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 12.md
(forcrawling) ~/weplay/weplay   bingo/12
 git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
(forcrawling) ~/weplay/weplay   master
 git checkout -b bingo/17
Switched to a new branch 'bingo/17'
(forcrawling) ~/weplay/weplay   bingo/17
 ls
README.md definitely.csv yamaha.py
(forcrawling) ~/weplay/weplay   bingo/17
 vi README.md
(forcrawling) ~/weplay/weplay   bingo/17 ●
 vi 17.md
(forcrawling) ~/weplay/weplay   bingo/17 ●
 git status
On branch bingo/17
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified:   README.md

Untracked files:
(use "git add ..." to include in what will be committed)

17.md

no changes added to commit (use "git add" and/or "git commit -a")
(forcrawling) ~/weplay/weplay   bingo/17 ●
 git add .
(forcrawling) ~/weplay/weplay   bingo/17 ✚
 git commit -m "17빙고도 커밋완료"
[bingo/17 28db542] 17빙고도 커밋완료
Committer: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

2 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 17.md
(forcrawling) ~/weplay/weplay   bingo/17
 git push origin bingo/17
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 410 bytes | 205.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
remote:
remote: Create a pull request for 'bingo/17' on GitHub by visiting:
remote: https://github.com/hyeongjunk05/weplay/pull/new/bingo/17
remote:
To https://github.com/hyeongjunk05/weplay.git

• [new branch] bingo/17 -> bingo/17
  (forcrawling) ~/weplay/weplay   bingo/17
   git checkout master
  Switched to branch 'master'
  Your branch is up to date with 'origin/master'.
  (forcrawling) ~/weplay/weplay   master
   git checkout bingo/12
  Switched to branch 'bingo/12'
  (forcrawling) ~/weplay/weplay   bingo/12
   git log
  commit c63ab65e63ccd87f4412a0f867c48aa885636c48 (HEAD -> bingo/12)
  Author: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
  Date: Tue Mar 10 16:09:57 2020 +0900

  12번 빙고 완료

commit 3d906e9854c133c7d21bb93853b7a3d64c0cf245 (origin/master, origin/HEAD, master)
Merge: ea82f85 3fcca46
Author: Hyeongjun Kim hyeongjunk05@gmail.com
Date: Tue Mar 10 16:06:23 2020 +0900

Merge pull request #2 from hyeongjunk05/bingo/3

3번 빙고

commit ea82f8524286d18356a6c99fbda616852c44b10c
Merge: cf95517 220e6b9
Author: Hyeongjun Kim hyeongjunk05@gmail.com
Date: Tue Mar 10 15:59:55 2020 +0900

Merge pull request #1 from hyeongjunk05/bingo/9

yamaha도 완료

commit 220e6b9ab85115f10bfc05d5462fc17db95e9c60 (origin/bingo/9, bingo/9)
Author: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
Date: Tue Mar 10 15:58:50 2020 +0900

(forcrawling) ~/weplay/weplay   bingo/12
 git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
(forcrawling) ~/weplay/weplay   master
 git checkout bingo/12
Switched to branch 'bingo/12'
(forcrawling) ~/weplay/weplay   bingo/12
 git push origin bingo/12
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 374 bytes | 187.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
remote:
remote: Create a pull request for 'bingo/12' on GitHub by visiting:
remote: https://github.com/hyeongjunk05/weplay/pull/new/bingo/12
remote:
To https://github.com/hyeongjunk05/weplay.git

• [new branch] bingo/12 -> bingo/12
  (forcrawling) ~/weplay/weplay   bingo/12
   git checkout master
  Switched to branch 'master'
  Your branch is up to date with 'origin/master'.
  (forcrawling) ~/weplay/weplay   master
   git pull origin master
  remote: Enumerating objects: 1, done.
  remote: Counting objects: 100% (1/1), done.
  remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
  Unpacking objects: 100% (1/1), done.
  From https://github.com/hyeongjunk05/weplay
• branch master -> FETCH_HEAD
  3d906e9..b2b650c master -> origin/master
  Updating 3d906e9..b2b650c
  1 👏🏻 👏🏻 👏🏻 👏🏻 👏🏻 WePlay 👏🏻 👏🏻 👏🏻 👏🏻 👏🏻
  Fast-forward
  17.md | 0
  README.md | 6 +++---
  2 files changed, 3 insertions(+), 3 deletions(-)
  create mode 100644 17.md
  (forcrawling) ~/weplay/weplay   master
   git checkout bingo/12
  Switched to branch 'bingo/12'
  (forcrawling) ~/weplay/weplay   bingo/12
   git rebase master
  First, rewinding head to replay your work on top of it...
  Applying: 12번 빙고 완료
  Using index info to reconstruct a base tree...
  M README.md
  Falling back to patching base and 3-way merge...
  Auto-merging README.md
  CONFLICT (content): Merge conflict in README.md
  error: Failed to merge in the changes.
  Patch failed at 0001 12번 빙고 완료
  hint: Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

(forcrawling) ✘  ~/weplay/weplay  ➦ b2b650c ●✚ >R>
 vi README.md
(forcrawling) ~/weplay/weplay  ➦ b2b650c ●✚ >R>
 git status
rebase in progress; onto b2b650c
You are currently rebasing branch 'bingo/12' on 'b2b650c'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)

Changes to be committed:
(use "git reset HEAD ..." to unstage)

new file:   12.md

Unmerged paths:
(use "git reset HEAD ..." to unstage)
(use "git add ..." to mark resolution)

both modified:   README.md

(forcrawling) ~/weplay/weplay  ➦ b2b650c ●✚ >R>
 git add .
(forcrawling) ~/weplay/weplay  ➦ b2b650c ✚ >R>
 git rebase --continue
Applying: 12번 빙고 완료
(forcrawling) ~/weplay/weplay   bingo/12
 git log
commit 5d4bcc5c15eb9ef80fd402e13a68f463565d0209 (HEAD -> bingo/12)
Author: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
Date: Tue Mar 10 16:09:57 2020 +0900

12번 빙고 완료

commit b2b650ce4f6f96d275dc67b20d7980f2203047eb (origin/master, origin/HEAD, master)
Merge: 3d906e9 28db542
Author: Hyeongjun Kim hyeongjunk05@gmail.com
Date: Tue Mar 10 16:12:38 2020 +0900

Merge pull request #3 from hyeongjunk05/bingo/17

17빙고도 커밋완료

commit 28db542605606e9a5038b328f5403418363b11ce (origin/bingo/17, bingo/17)
Author: Hyeongjun Kim hyeongjunkim@Hyeongjunui-MacBookAir.local
Date: Tue Mar 10 16:11:59 2020 +0900

17빙고도 커밋완료

commit 3d906e9854c133c7d21bb93853b7a3d64c0cf245
Merge: ea82f85 3fcca46
Author: Hyeongjun Kim hyeongjunk05@gmail.com
Date: Tue Mar 10 16:06:23 2020 +0900

Merge pull request #2 from hyeongjunk05/bingo/3

(forcrawling) ~/weplay/weplay   bingo/12
 git push origin bingo/12
To https://github.com/hyeongjunk05/weplay.git
! [rejected] bingo/12 -> bingo/12 (non-fast-forward)
error: failed to push some refs to 'https://github.com/hyeongjunk05/weplay.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(forcrawling) ✘  ~/weplay/weplay   bingo/12
 git push origin bingo/12 --force
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 287 bytes | 287.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To https://github.com/hyeongjunk05/weplay.git

• c63ab65...5d4bcc5 bingo/12 -> bingo/12 (forced update)