Skip to content

feat(merge): add conflict_choose_side action to replace merged buffer with one whole side#276

Merged
dlyongemallo merged 1 commit into
mainfrom
263-ours_theirs
Jul 1, 2026
Merged

feat(merge): add conflict_choose_side action to replace merged buffer with one whole side#276
dlyongemallo merged 1 commit into
mainfrom
263-ours_theirs

Commits

Commits on Jul 1, 2026