From a7b4b864ca14dea6e9bbc649005496e8ec395664 Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Thu, 12 Sep 2024 19:42:15 -0300 Subject: [PATCH] chore(.gitattributes): add merge settings for .gas-report and .gas-snapshot: merge always everything from merging branch - as this is the real value of current gas costs. --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 9b99705..6d68e7f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ lib/** linguist-vendored * text=auto eol=lf + +.gas-report merge=ours +.gas-snapshot merge=ours \ No newline at end of file