paper-concept.git/.gitattributes, branch master Paper (Towards Long-term and Archivable Reproducibility) Updated .gitattributes to include all files to not merge 2020-06-03T18:47:23+00:00 Mohammad Akhlaghi mohammad@akhlaghi.org 2020-06-03T18:47:23+00:00 fc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 Following a test merge, I noticed that the '.gitattributes' file is not doing anything about the deleted files and also that all the files in 'tex/src/*.txt' should be added (they are too project-specific). So now it only includes the files that aren't deleted. For the files that are deleted, in the Maneage 'README-hacking.md' file, I added an AWK command to easily remove them. 
Following a test merge, I noticed that the '.gitattributes' file is not
doing anything about the deleted files and also that all the files in
'tex/src/*.txt' should be added (they are too project-specific). So now it
only includes the files that aren't deleted.

For the files that are deleted, in the Maneage 'README-hacking.md' file, I
added an AWK command to easily remove them.
Added a .gitattributes file to avoid merging some files 2020-05-01T21:37:32+00:00 Mohammad Akhlaghi mohammad@akhlaghi.org 2020-05-01T21:37:32+00:00 7fee88631998449ba9572dc491e4401189bdedfe As explained in the new `README-hacking.md', this files greatly helps in avoiding un-necessary conflicts. 
As explained in the new `README-hacking.md', this files greatly helps in
avoiding un-necessary conflicts.