(git) Pull 명령 후 non-fast-forward 문제 한방에 해결!

 

 

Pushing to ssh://git@Ip주소/dir/project.git

To ssh://Ip주소/dir/project.git

 

 

 

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'ssh://git@Ip주소/dir/project.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.

발생원인 :

깃에서 생성된 저장소와 로켈에 생성된 저장소 간 공통분모가 없는 상태에서 병합하려고 해서 발생한 에러.

해결방법

 

 

 

 

git pull origin --allow-unrelated-histories

			git pull origin --allow-unrelated-histories

이제 다시 pull 요청을 하면 될겁니다!!