root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,312 Commits 1 Branch 0 Tags
7eceec00cc4fc717978e9ffeed3e6ef5f35ff093
Commit Graph

3 Commits

Author SHA1 Message Date
gsxdsm
c6b4897a5d Update docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2026-06-03 15:26:49 -07:00
gsxdsm
772d08ee8d Update docs/solutions/best-practices/merge-conflict-extraction-vs-semantics-and-parallel-bootstrap.md 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2026-06-03 15:26:28 -07:00
gsxdsm
d188f7cb04 docs: capture merge-conflict learning (extraction vs semantic change) 
Document the refactor-vs-semantics merge resolution pattern (port the
upstream semantic change into the extracted helper, never pick a side)
and the parallel-bootstrap CONCEPTS.md add/add union, with the FN-5902 /
runFeatureValidation merge as the worked example.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-03 15:15:19 -07:00