Pull, Rebase, Merge, Cherry Pick

Rebase

Pull

Merge

Cherry Pick

Ref

• https://firework-ham.tistory.com/12

• https://velog.io/@chaerin00/Gitkraken-usage

Trouble Shooting

• 왜 Git은 맨날 쓰는데도 헤매는 것일까 ...

• 문제 상황 :

  • git pull --rebase 후 push 하는데 아래와 같은 에러 메세지가 떴다.

error: failed to push some refs to 'my-repository.git'
hint: Updates were rejected because the tip of your current branch is behind its remote counterpart. 
Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again.
See the 'Note about fast-forwards' in 'git push --help' for details.

• Ref

  • https://stackoverflow.com/questions/39399804/updates-were-rejected-because-the-tip-of-your-current-branch-is-behind-its-remot

Merging via commend line