오랜만에 하다 보니 까먹어서 어떻게 하는건지 모르겠는데..
일단 git fetch origin develop:develop 한 다음 git merge develop 하니까 개인 수정 파일이랑 겹치는지 에러가 나더군요. (정확한 메세지는 지금 창을 닫아버려서 모르겠네요)
그 다음에 git status 해보니까 다음과 같이 나옵니다
# Changed but not updated: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README.md # modified: classes/db/DB.class.php # modified: common/framework/debug.php # modified: common/framework/drivers/cache/sqlite.php # modified: common/framework/filters/htmlfilter.php # modified: common/js/common.js # modified: common/tpl/popup_layout.html # modified: modules/advanced_mailer/advanced_mailer.admin.controller.php # modified: modules/advanced_mailer/advanced_mailer.admin.view.php # modified: modules/advanced_mailer/advanced_mailer.class.php # modified: modules/advanced_mailer/advanced_mailer.controller.php # modified: modules/advanced_mailer/conf/info.xml # modified: modules/advanced_mailer/conf/module.xml # modified: modules/advanced_mailer/lang/en.php # modified: modules/advanced_mailer/lang/ko.php # deleted: modules/advanced_mailer/queries/countLogByType.xml # deleted: modules/advanced_mailer/queries/deleteLogs.xml # deleted: modules/advanced_mailer/queries/getLogByType.xml # deleted: modules/advanced_mailer/queries/insertLog.xml # modified: modules/advanced_mailer/tpl/common.html # modified: modules/advanced_mailer/tpl/config.html # modified: modules/advanced_mailer/tpl/js/config.js # deleted: modules/advanced_mailer/tpl/test.html # deleted: modules/advanced_mailer/tpl/view_log.html # modified: modules/communication/communication.view.php # modified: modules/communication/lang/ko.php # modified: modules/communication/skins/default/css/communication.css # modified: modules/communication/skins/default/messages.html # modified: modules/document/document.item.php # modified: modules/member/member.admin.view.php # modified: modules/member/member.controller.php # modified: modules/member/member.view.php # modified: modules/page/tpl/index.html # modified: modules/spamfilter/lang/en.php # modified: modules/spamfilter/lang/ja.php # modified: modules/spamfilter/lang/ko.php # modified: modules/spamfilter/schemas/spamfilter_denied_ip.xml # modified: modules/spamfilter/schemas/spamfilter_denied_word.xml # modified: modules/spamfilter/spamfilter.admin.controller.php # modified: modules/spamfilter/spamfilter.controller.php # modified: modules/spamfilter/spamfilter.model.php # modified: modules/spamfilter/tpl/config_block.html # modified: modules/spamfilter/tpl/denied_ip_list.html # modified: modules/spamfilter/tpl/denied_word_list.html # modified: tests/unit/framework/filters/HTMLFilterTest.php # modified: tests/unit/framework/filters/IpFilterTest.php # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # modules/advanced_mailer/queries/countMailLogByType.xml # modules/advanced_mailer/queries/countSMSLogByType.xml # modules/advanced_mailer/queries/deleteMailLogs.xml # modules/advanced_mailer/queries/deleteSMSLogs.xml # modules/advanced_mailer/queries/getMailLogByType.xml # modules/advanced_mailer/queries/getSMSLogByType.xml # modules/advanced_mailer/queries/insertMailLog.xml # modules/advanced_mailer/queries/insertSMSLog.xml # modules/advanced_mailer/schemas/advanced_mailer_sms_log.xml # modules/advanced_mailer/tpl/mail_log.html # modules/advanced_mailer/tpl/mail_test.html # modules/advanced_mailer/tpl/sms_log.html # modules/advanced_mailer/tpl/sms_test.html no changes added to commit (use "git add" and/or "git commit -a")
그리고 다시 한번 git merge develop 해보면 다음과 같이 뜨네요
error: Your local changes to 'README.md' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.
이 상태에서 뭘 어떻게 해야 할까요?
아 그리고 지금 홈페이지에서 글을 쓰거나 어드민으로 들어가려고 하면
PHP Parse Error: syntax error, unexpected '<<' (T_SL) in modules/spamfilter/lang/ko.php on line 16
라는 오류 메세지가 뜨네요
아, git reset --hard 로 "Changed but not updated" 상태의 파일들은 전부 원복이 가능하네요. (에러메세지도 사라지네요)
다만 Untracked files 이것들은 지워지지는 않네요. git merge develop 하고 나서 생긴거 같은데..