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
터미널에서 위와 같은 메세지 나오면 어떻게 해야하나요
https://heytech.tistory.com/155
1) git stash
2) git pull origin main
3) git stash pop