Resolve conflicts by preferring remote changes

This commit is contained in:
g1nation
2026-05-14 21:58:59 +09:00
parent 0004853fcf
commit 05d05a392c
12 changed files with 1237 additions and 837 deletions
+4 -19
View File
@@ -127,23 +127,8 @@
## 2026-05-13
- Auto development record created: development/2026-05-13_volumes-data-project-antigravity-connectai-이-프로젝트-작업할거야_implementation.md
## 2026-05-14
- Auto decision record created: decisions\ADR-0011-e-wiki-connectai-self-reflection-기능이-있는데-어떻게-self-reflection.md
## 2026-05-13
- Auto planning record created: planning/2026-05-13_connectai-architecture-문서-최신화-해줘.md
## 2026-05-14
- Auto decision record created: decisions\ADR-0012-e-wiki-connectai-self-reflection-기능이-있는데-어떻게-self-reflection.md
## 2026-05-14
- Auto development record created: development\2026-05-14_reflector-에이전트가-1인-기업-에이전트-목록에는-안보이는데_implementation.md
## 2026-05-14
- Auto bug record created: bugs\BUG-0012-질문이-있어-논문을-쓰려고해-논문-주제는-서비스적이-아닌-사용자가-ai에게-구조로-질문을-해야-사용자의-의도.md
## 2026-05-14
- Auto bug record created: bugs\BUG-0013-thesis-paper를-쓰려고-하는데-아래와-같이-쓰면-좋을까-이런-식으로-쓰면-되지-않을까-싶음-1-in.md
## 2026-05-14
- Auto bug record created: bugs\BUG-0014-논문-outline-title-인간-ai-상호작용에서-의도-정렬을-높이기-위한-최소-질의-구조-연구-또는-사.md
## 2026-05-14
- Auto discussion record created: discussions\2026-05-14_최성연-알아-칼리버스에서-근무한데.md
## 2026-05-13
- Auto planning record created: planning/2026-05-13_지금-connectai-architecture-md-문서-내용-중-업데이트가-필요한-부분이-있는지-확인해줘-.md