Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meta: ignore flake.lock when merging in changes

Browse source
This commit is contained in:
Infinidoge 2021-11-10 09:28:27 -05:00
parent 9193cec295
commit 745975409d
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
flake.lock merge=ignore

1
users/profiles/git.nix
View file

@ -4,6 +4,7 @@
extraConfig = {
pull.rebase = true;
merge.ignore.driver = "true";
};
aliases = {