[TIL] Git pull —rebase /git branch -d tset / test branch
Dec 11, 2023 | Jun 25, 2024
| Ryoon.With.Wisdomtrees
이슈: Git pull error
git pull hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation.
해결:
한 다음 적절한 조치를 취하고, add & commit.
그 다음 계속 git rebase --continue, repeat.
git branch -d tset / test branch
깃 브랜치 생성후 바로 해당 브랜치로 이동
뒤로