git rebase

2번째 git rebase 연습. 지훈님과.

git checkout master
Switched to branch 'master'
1 1st amend
Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
(hello2) ~/git5   master
 git pull origin master
From https://github.com/wecode-bootcamp-korea/git5

• branch master -> FETCH_HEAD
  Updating b99286f..d0ec3e2
  Fast-forward
  README.md | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
  (hello2) ~/git5   master
   git rebase -i master feature/rebase0
  Auto-merging README.md
  CONFLICT (content): Merge conflict in README.md
  1 # This is a combination of 3 commits.
  error: could not apply baeacec... 1st amend
  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".
  Could not apply baeacec... 1st amend
  (hello2) ✘  ~/git5  ➦ d0ec3e2 ●✚ >R>
   vim README.md
  (hello2) ~/git5  ➦ d0ec3e2 ●✚ >R>
   git add .
  (hello2) ~/git5  ➦ d0ec3e2 ✚ >R>
   git rebase --continue
  [detached HEAD 0111f39] 1st amend
  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

1 file changed, 11 insertions(+), 11 deletions(-)
[detached HEAD b8d8907] 3rd amend
Date: Tue Mar 10 18:29:15 2020 +0900
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

1 file changed, 11 insertions(+), 11 deletions(-)
Successfully rebased and updated refs/heads/feature/rebase0.
(hello2) ~/git5   feature/rebase0
 git push origin feature/rebase0
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), 349 bytes | 69.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
remote:
remote: Create a pull request for 'feature/rebase0' on GitHub by visiting:
remote: https://github.com/wecode-bootcamp-korea/git5/pull/new/feature/rebase0
remote:
To https://github.com/wecode-bootcamp-korea/git5