git pull 했을 때

Views 585 Votes 0 Comment 1

Larger Font Smaller Font Up Down Go comment Print

5063a14..041e3a0 main -> origin/main
error: Your local changes to the following files would be overwritten by merge:
layouts/el_imin/layout.html
modules/board/skins/eb_imin/view.html
Please commit your changes or stash them before you merge.
Aborting
Updating 5063a14..041e3a0

터미널에서 위와 같은 메세지 나오면 어떻게 해야하나요

Who's 이온디

라이믹스는 이온디와 함께

Dislike

Facebook Twitter Google Pinterest

Up Down Go comment Print

✔Write a comment

Select Editor

✔ Textarea ✔ WYSIWYG

Write a comment You do not have permission to access. Sign In?

Comments '1'

이온디 2022.01.22 04:20

https://heytech.tistory.com/155

1) git stash
2) git pull origin main
3) git stash pop

Comment

추가시작추가끝

질문•답변

상품문의, 포인트관련 문의는 멤버십 지원게시판에 작성해주세요. (프로젝트>기술지원)

No Image notice by 이온디 2024/06/11 in 기타

본 게시판의 용도
No Image 30Jul
by 이온디
2022/07/30 in git

After changing branch in phpstorm, the directory is not visible
No Image 30Jan
by 이온디
2022/01/30 in git
Replies 1

git pull 했을 때 (2)
No Image 21Jan
by 이온디
2022/01/21 in git
Replies 1

git pull 했을 때
27Dec
by 이온디
2021/12/27 in git

git의 .gitignore 사용방법 문의