GIT

[Git] fatal: Need to specify how to reconcile divergent branches.

git pull origin main From https://github.com/synuns/TMIL * branch main -> FETCH_HEAD 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 ..

[Git] github SSH키 추가하기

⚠ $git push origin main 했는데 오류가 발생한다. remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead. remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information. github에서 더이상 패스워드 인증 방식을 지원하지 않는다. 토큰이나 SSH 키 인증 방식만 사용해야 한다. 처음 git을 공부하는 분들은 '나는 21년 8월 13일에 github를 쓴적이 없는데?' 당..