Auto/atom-demo-codesys
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add buildinfo and other folders, update gitignore

Browse Source
This commit is contained in:
Clarence Dick 2025-06-27 14:47:19 -06:00
parent ddfdb5b73a
commit 3c6763278d
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@ -1,14 +1,10 @@
############################################################ ############################################################
# DO NOT EDIT THIS FILE - the content may be overwritten # DO NOT EDIT THIS FILE - the content may be overwritten
# Version: 1.0.0.0 # Version: 1.0.0.0
############################################################ ############################################################
# not try to merge files when they have conflicts, but rather use our side of the merge over others. # not try to merge files when they have conflicts, but rather use our side of the merge over others.
* merge=ours * merge=ours
# tread these files as binaries # tread these files as binaries
*.meta -text -diff *.meta -text -diff
*.object -text -diff *.object -text -diff
buildinfo/* filter=lfs diff=lfs merge=lfs -text

4
.gitignore vendored
View File

@ -29,3 +29,7 @@ project/**/*.theirs
# Ignore .apsession # Ignore .apsession
.apsession .apsession
!buildinfo/
!other/

BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.bootinfo_guids (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
buildinfo/atom-library-v2.Device.Application.74ccca2f-50e3-4d5a-9d7a-9fd420284f83.compileinfo (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
other/New Text Document.txt Normal file
View File