After changing branch in phpstorm, the directory is not visible
After changing branch in phpstorm, the directory is not visible
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
무슨 문제일까요?
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
터미널에서 위와 같은 메세지 나오면 어떻게 해야하나요
.gitignore 파일에
/layouts/라고 적어뒀는데
저런 메시지 뜨는건 왜 그럴까요?
!layouts/el_imin/
해당 디렉토리에는 이것만 제외시켰는데.
그리고 하단에 *.zip 추가해서 zip파일도 제외시킨거 같은데 제가 잘못 작성한 걸까요
전체 루트를 깃으로 선택하고 해당 저 폴더만 제외시켜서 깃에 업로드하고 싶은데 어떻게 하면 될까요?