v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

invert meger strategy

Browse source
This commit is contained in:
Vivian 2023-06-27 11:23:25 +02:00
parent b64a6f2271
commit dcbc668f71
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/common/hm-modules/git.nix
View file

@ -15,9 +15,9 @@ in {
init.defaultBranch = "main";
# Git merge driver that always grabs upstream changes
# Useful for e.g. lock files
merge.theirs = {
name = "Keep Upstream Changes";
driver = "cp -f '%B' '%A'";
merge.ours = {
name = "Overwrite Upstream Changes";
driver = "cp -f '%A' '%B'";
};
};
@ -25,7 +25,7 @@ in {
};
home.file.".config/git/attributes".text = ''
flake.lock merge=theirs
flake.lock merge=ours
'';
};
}