Documentation
¶
Index ¶
Constants ¶
This section is empty.
Variables ¶
This section is empty.
Functions ¶
func MergeTextsIgnoreConflictIgnoreDelete ¶
func MergeTextsIgnoreConflictIgnoreDelete(base, pc1, pc2 string, pc1First bool) (merged string, err error)
MergeTextsIgnoreConflictIgnoreDelete merges text, ignores conflicts and deletions, retains all text of PC1 and PC2 based on base MergeTextsIgnoreConflictIgnoreDelete 合并文本，忽略冲突和删除, 保留PC1 PC2基于base的全部文本 PC1 is clientContent, PC2 is serverContent PC1 为 clientContent, PC2 为 serverContent
Types ¶
type MergeResult ¶
type MergeResult struct {
Content string // Merged content // 合并后的内容
HasConflict bool // Whether conflict exists // 是否存在冲突
ConflictInfo string // Conflict details // 冲突详情
}
MergeResult merge result // 合并结果
func MergeTexts ¶
func MergeTexts(base, pc1, pc2 string, pc1First bool) (MergeResult, error)
MergeTexts three-way text merge MergeTexts 三方合并文本 Retain delete operations after refactoring, detect delete-modify conflict 重构后保留删除操作，检测删除-修改冲突
Source Files
Click to show internal directories.
Click to hide internal directories.