From 7fee88631998449ba9572dc491e4401189bdedfe Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Fri, 1 May 2020 22:37:32 +0100 Subject: Added a .gitattributes file to avoid merging some files As explained in the new `README-hacking.md', this files greatly helps in avoiding un-necessary conflicts. --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..280f260 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +paper.tex merge=ours +tex/src/delete-me.mk merge=ours +tex/src/delete-me-demo.mk merge=ours +reproduce/analysis/make/delete-me.mk merge=ours +reproduce/software/config/TARGETS.conf merge=ours +reproduce/analysis/config/delete-me-num.conf merge=ours \ No newline at end of file -- cgit v1.2.1