From 3c6763278db92f263f2f8dce0917c732148f54ee Mon Sep 17 00:00:00 2001 From: Clarence Dick Date: Fri, 27 Jun 2025 14:47:19 -0600 Subject: [PATCH] Add buildinfo and other folders, update gitignore --- .gitattributes | 6 +----- .gitignore | 4 ++++ ...pplication.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo | 3 +++ ...tion.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids | 3 +++ ...ication.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo | 3 +++ other/New Text Document.txt | 0 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo create mode 100644 buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids create mode 100644 buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo create mode 100644 other/New Text Document.txt diff --git a/.gitattributes b/.gitattributes index 4a4aa3d..9d39727 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,10 @@ - ############################################################ # DO NOT EDIT THIS FILE - the content may be overwritten # Version: 1.0.0.0 ############################################################ - - - # not try to merge files when they have conflicts, but rather use our side of the merge over others. * merge=ours - # tread these files as binaries *.meta -text -diff *.object -text -diff +buildinfo/* filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index bca0ddb..fec5c85 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ project/**/*.theirs # Ignore .apsession .apsession + +!buildinfo/ + +!other/ diff --git a/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo new file mode 100644 index 0000000..17c683d --- /dev/null +++ b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61ab0f2fffacebdab40f719add3565ea7f13006095ec367ee2dfa9bd103a9607 +size 60844864 diff --git a/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids new file mode 100644 index 0000000..5d75861 --- /dev/null +++ b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9a9e39703e447ee56ba634166eee111f0c10c5e109b07e783d1c4b5803f6a13 +size 32 diff --git a/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo new file mode 100644 index 0000000..17c683d --- /dev/null +++ b/buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61ab0f2fffacebdab40f719add3565ea7f13006095ec367ee2dfa9bd103a9607 +size 60844864 diff --git a/other/New Text Document.txt b/other/New Text Document.txt new file mode 100644 index 0000000..e69de29