lukaszraczylo/harness-sync
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/harness-sync.git synced 2026-10-14 00:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(merge): three-way merge via git merge-file with conflict detection

Browse Source
This commit is contained in:
lukaszraczylo
2026-05-23 02:48:36 +01:00
parent 95962bdf9a
commit 0e77393400
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/merge/merge.go
+5 -5
View File
@@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
) )
// Inputs: // Inputs holds the three versions required for a three-way merge.
// //
// Base = last-rendered snapshot (state/...) // Base = last-rendered snapshot (state/...)
// Ours = new rendered output (what we'd write now) // Ours = new rendered output (what we'd write now)
@@ -31,19 +31,19 @@ func ThreeWay(in Inputs) (*Result, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer os.RemoveAll(tmp) defer func() { _ = os.RemoveAll(tmp) }()
oursPath := filepath.Join(tmp, "ours") oursPath := filepath.Join(tmp, "ours")
basePath := filepath.Join(tmp, "base") basePath := filepath.Join(tmp, "base")
theirsPath := filepath.Join(tmp, "theirs") theirsPath := filepath.Join(tmp, "theirs")
if err := os.WriteFile(oursPath, in.Ours, 0o644); err != nil { if err := os.WriteFile(oursPath, in.Ours, 0o600); err != nil {
return nil, err return nil, err
} }
if err := os.WriteFile(basePath, in.Base, 0o644); err != nil { if err := os.WriteFile(basePath, in.Base, 0o600); err != nil {
return nil, err return nil, err
} }
if err := os.WriteFile(theirsPath, in.Theirs, 0o644); err != nil { if err := os.WriteFile(theirsPath, in.Theirs, 0o600); err != nil {
return nil, err return nil, err
} }