invert meger strategy
This commit is contained in:
parent
1a722e194f
commit
0260a1cec6
2 changed files with 7 additions and 7 deletions
|
@ -665,11 +665,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687847320,
|
"lastModified": 1687856573,
|
||||||
"narHash": "sha256-/nISfR5SHOYWhpoMFp1LqXbRm1MuqY+gxUMggXM9HMk=",
|
"narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3bc1bc40121eb0975dc3d96741300bb4fd16be29",
|
"rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -15,9 +15,9 @@ in {
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
# Git merge driver that always grabs upstream changes
|
# Git merge driver that always grabs upstream changes
|
||||||
# Useful for e.g. lock files
|
# Useful for e.g. lock files
|
||||||
merge.theirs = {
|
merge.ours = {
|
||||||
name = "Keep Upstream Changes";
|
name = "Overwrite Upstream Changes";
|
||||||
driver = "cp -f '%B' '%A'";
|
driver = "cp -f '%A' '%B'";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file.".config/git/attributes".text = ''
|
home.file.".config/git/attributes".text = ''
|
||||||
flake.lock merge=theirs
|
flake.lock merge=ours
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue