Prepared statement failed: INSERT INTO `xe_nproduct_extra_vars` (`item_srl`, `name`) VALUES (?, ?)Field 'value' doesn't have a default value 

누리고 상품 등록시 위와 같은 오류 메세지 출력됨.

https://kjwsx23.tistory.com/256

https://intellij-support.jetbrains.com/hc/en-us/community/posts/206083889-How-set-the-tab-size-to-2-spaces

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.

무슨 문제일까요?