아래 추가 질문드립니다.

방금 라이믹스 공홈에서 1.9.10을 받아서 업로드 하였습니다. 다시 git pull 을 해보니

[root@localhost public_html]# git pull
Updating f9ab8da..b6e21eb
error: Your local changes to the following files would be overwritten by merge:
        CONTRIBUTING.md
        README.md
        addons/adminlogging/conf/info.xml
        addons/autolink/autolink.js
        addons/autolink/conf/info.xml
        addons/counter/conf/info.xml
        addons/counter/counter.addon.php
        addons/member_extra_info/conf/info.xml
        addons/member_extra_info/member_extra_info.addon.php
        addons/member_extra_info/member_extra_info.lib.php
        addons/photoswipe/conf/info.xml
        addons/photoswipe/rx_photoswipe.js
        addons/point_level_icon/conf/info.xml
        addons/point_level_icon/point_level_icon.addon.php
        addons/point_level_icon/point_level_icon.lib.php
        addons/recaptcha/conf/info.xml
        addons/recaptcha/lang/en.php
        addons/recaptcha/lang/ko.php
        addons/recaptcha/recaptcha.addon.php
        addons/recaptcha/recaptcha.class.php
        addons/recaptcha/recaptcha.js
        addons/resize_image/btn.png
        addons/resize_image/conf/info.xml
        addons/resize_image/css/resize_image.mobile.css
        addons/resize_image/js/resize_image.js
        addons/resize_image/resize_image.addon.php
        classes/cache/CacheHandler.class.php
        classes/context/Context.class.php
        classes/db/DB.class.php
        classes/db/DBMysql.class.php
        classes/db/queryparts/Query.class.php
        classes/db/queryparts/Subquery.class.php
        classes/db/queryparts/condition/Condition.class.php
        classes/db/queryparts/condition/ConditionGroup.class.php
        classes/db/queryparts/condition/ConditionSubquery.class.php
        classes/db/queryparts/condition/ConditionWithArgument.class.php
        classes/db/queryparts/condition/ConditionWithoutArgument.class.php
        classes/db/queryparts/expression/ClickCountExpression.class.php
        classes/db/queryparts/expression/DeleteExpression.class.php
        classes/db/queryparts/expression/Expression.class.php
        classes/db/queryparts/expression/InsertExpression.class.php
        classes/db/queryparts/expression/SelectExpression.class.php
        classes/db/queryparts/expression/StarExpression.class.php
        classes/db/queryparts/expression/UpdateExpression.class.php
        classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.p      hp
        classes/db/queryparts/limit/Limit.class.php
        classes/db/queryparts/order/OrderByColumn.class.php
        classes/db/queryparts/table/IndexHint.class.php
        classes/db/queryparts/table/JoinTable.class.php
        classes/db/queryparts/table/MysqlTableWithHint.class.php
        classes/db/queryparts/table/Table.class.php
        classes/display/DisplayHandler.class.php
        classes/display/HTMLDisplayHandler.php
        classes/display/VirtualXMLDisplayHandler.php
        classes/editor/EditorHandler.class.php
        classes/extravar/Extravar.class.php
        classes/file/FileHandler.class.php
        classes/frontendfile/FrontEndFileHandler.class.php
        classes/mobile/Mobile.class.php
        classes/module/ModuleHandler.class.php
        classes/module/ModuleObject.class.php
        classes/object/Object.class.php
        classes/security/IpFilter.class.php
        classes/security/Password.class.php
        classes/security/Security.class.php
        classes/template/TemplateHandler.class.php
        classes/validator/Validator.class.php
        classes/xml/XmlJsFilter.class.php
        classes/xml/XmlLangParser.class.php
        classes/xml/XmlParser.class.php
        classes/xml/XmlQueryParser.class.php
        classes/xml/xmlquery/DBParser.class.php
        classes/xml/xmlquery/QueryParser.class.php
        classes/xml/xmlquery/argument/Argument.class.php
        classes/xml/xmlquery/argument/ConditionArgument.class.php
        classes/xml/xmlquery/argument/SortArgument.class.php
        classes/xml/xmlquery/queryargument/DefaultValue.class.php
        classes/xml/xmlquery/queryargument/QueryArgument.class.php
        classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
        classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.clas      s.php
        classes/xml/xmlquery/tags/column/ColumnTag.class.php
        classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
        classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.ph      p
        classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
        classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
        classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
        classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
        classes/xml/xmlquery/tags/column/UpdateColumnsTag.clas
error: The following untracked working tree files would be overwritten by merge:
        .github/workflows/ci.yml
        modules/admin/tpl/img/flag.id.gif
        modules/autoinstall/queries/deletePackages.xml
        modules/autoinstall/tpl/config.html
        modules/editor/skins/simpleeditor/css/simpleeditor.less
        modules/editor/skins/simpleeditor/editor.html
        modules/editor/skins/simpleeditor/js/interface.js
        modules/editor/skins/simpleeditor/js/simpleeditor.js
        modules/editor/skins/simpleeditor/skin.xml
Please move or remove them before you can merge.
Aborting
[root@localhost public_html]# 

이렇게 나옵니다. 에러가 두개 나오는데요.. 처음

error: Your local changes to the following files would be overwritten by merge:

과

error: The following untracked working tree files would be overwritten by merge: 인데요...

첫번째는 1.9.10 을 덮어 씌웠는데도 에러메시지가 나오네요

두번째는 해당 파일을 삭제해야 할까요?

처음  php7.0으로 복구 했을때도 게시글이 보이지 않았습니다. 라이믹스 최신 버전으로 패치하기 위해서 php7.4  변경해본것이거든요

phpmyadmin 에 들어가보니 게시글이 존재하더라고요.. 전 서버 재부팅할때 엄청 느려지고 ssh 접속도 안되서 강제 리부팅을 했습니다. 그래서 이 과정에서 디비 게시글이 없어진줄 알았습니다.

아마 이 문제가 이슈가 발생한지 몇일전부터 디비쪽에있었을 수도 있다는 생각이 듭니다. 문제 발생시 3일전까지 웹파일과 디비파일이 있어서 복구를 했는데도 게시글이 보이지 않은 이유인거 같습니다..

이제는 백업파일을 최소 1개원정도로 보관하게 해야 할거 같네요..