• 새로운 소식이 있나요?
  • 이미지
    2022-01-30

    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.


    무슨 문제일까요?

    1
  • 이미지
    2022-01-21

       5063a14..041e3a0  main       -> origin/mainerror: Your local changes to the following files would be overwritten by merge:layouts/el_imin/layout.htmlmodules/board/skins/eb_imin/view.htmlPlease commit your changes or stash them before you merge.AbortingUpdating 5063a14..041e3a0

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

    1