Rhymix 2.0.23 최신 패치를 git update 하였습니다.
아래와 같이 충돌이 발생했는데요.
중략
CONFLICT (content): Merge conflict in modules/board/board.model.php
중략
Automatic merge failed; fix conflicts and then commit the result.
<<<<<<< HEAD <?php /* Copyright (C) NAVER <http://www.navercorp.com> */ /** * @class boardModel * @author NAVER ([email protected]) * @brief board module Model class **/ class boardModel extends module { /** * @brief initialization **/ function init() { } /** * @brief get the list configuration **/ public static function getListConfig($module_srl) { // get the list config value, if it is not exitsted then setup the default value $list_config = ModuleModel::getModulePartConfig('board', $module_srl); if(!is_array($list_config) || count($list_config) <= 0) { $list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count'); } // get the extra variables $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); foreach($list_config as $key) { if(preg_match('/^([0-9]+)$/',$key)) { if($inserted_extra_vars[$key]) { $output['extra_vars'.$key] = $inserted_extra_vars[$key]; } else { continue; } } else { $output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } } return $output; } /** * @brief return the default list configration value **/ public static function getDefaultListConfig($module_srl) { // add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc. $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'module_title', 'nick_name', 'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status'); foreach($virtual_vars as $key) { $extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } // get the extra variables from the document model $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); if(count($inserted_extra_vars)) { foreach($inserted_extra_vars as $obj) { $extra_vars['extra_vars'.$obj->idx] = $obj; } } return $extra_vars; } /** * @brief return module name in sitemap **/ public function triggerModuleListInSitemap(&$obj) { array_push($obj, 'board'); } } class xboardModel extends module { /** * @brief initialization **/ function init() { } /** * @brief get the list configuration **/ public static function getListConfig($module_srl) { // get the list config value, if it is not exitsted then setup the default value $list_config = ModuleModel::getModulePartConfig('board', $module_srl); if(!is_array($list_config) || count($list_config) <= 0) { $list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count'); } // get the extra variables $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); foreach($list_config as $key) { if(preg_match('/^([0-9]+)$/',$key)) { if($inserted_extra_vars[$key]) { $output['extra_vars'.$key] = $inserted_extra_vars[$key]; } else { continue; } } else { $output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } } return $output; } /** * @brief return the default list configration value **/ public static function getDefaultListConfig($module_srl) { // add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc. $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'module_title', 'nick_name', 'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status'); foreach($virtual_vars as $key) { $extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } // get the extra variables from the document model $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); if(count($inserted_extra_vars)) { foreach($inserted_extra_vars as $obj) { $extra_vars['extra_vars'.$obj->idx] = $obj; } } return $extra_vars; } /** * @brief return module name in sitemap **/ public function triggerModuleListInSitemap(&$obj) { array_push($obj, 'board'); } } ======= <?php /* Copyright (C) NAVER <http://www.navercorp.com> */ /** * @class boardModel * @author NAVER ([email protected]) * @brief board module Model class **/ class boardModel extends module { /** * @brief initialization **/ function init() { } /** * @brief get the list configuration **/ public static function getListConfig($module_srl) { // get the list config value, if it is not exitsted then setup the default value $list_config = ModuleModel::getModulePartConfig('board', $module_srl); if(!is_array($list_config) || count($list_config) <= 0) { $list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count'); } // get the extra variables $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); foreach($list_config as $key) { if(preg_match('/^([0-9]+)$/',$key)) { if($inserted_extra_vars[$key]) { $output['extra_vars'.$key] = $inserted_extra_vars[$key]; } else { continue; } } else { $output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } } return $output; } /** * @brief return the default list configration value **/ public static function getDefaultListConfig($module_srl) { // add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc. $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'module_title', 'nick_name', 'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'thumbnail', 'summary', 'comment_status'); foreach($virtual_vars as $key) { $extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null); } // get the extra variables from the document model $inserted_extra_vars = DocumentModel::getExtraKeys($module_srl); if(count($inserted_extra_vars)) { foreach($inserted_extra_vars as $obj) { $extra_vars['extra_vars'.$obj->idx] = $obj; } } return $extra_vars; } /** * @brief return module name in sitemap **/ public function triggerModuleListInSitemap(&$obj) { array_push($obj, 'board'); } } >>>>>>> master
master가 최신이 맞는 것 같아 HEAD 삭제하고 master 만 남기려고 하는데 맞는 지 문의드립니다. 미리 감사드립니다.
해당 파일 님이 수정하셧거나 아니면 은연중에 수정된 파일이 되어 잇습니다 그래서 코어에서 고칠려니 문제가 되는겁니다. 공식 라이믹스 홈페이지 메뉴얼에서 해당 충돌에 대한 정보를 제공중에 잇습니다
https://rhymix.org/manual/introduction/update
소스수정이 잇는 경우항목을 보시길 바랍니다