invert meger strategy
This commit is contained in:
parent
1a722e194f
commit
0260a1cec6
2 changed files with 7 additions and 7 deletions
|
@ -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
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue