aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-01-01 14:46:50 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-01-01 14:46:50 +0000
commitd8b85fe8dc48fafe87b482ae36eb388a33c806f0 (patch)
tree34d0e266e7f7b7c10af86d642e03fcf8034dd107 /reproduce/software
parent044fc66b9679cc4556d7d6c377d881a9d128afe2 (diff)
Added step README-hacking's checklist to avoid merging dummy files
During the checklist we guide the user to delete the dummy `delete-me*' files from their custom branch. Later, if the dummy files are updated in the template's master branch, if the user merges with the template branch, these files will be written back into their project! This is very annoying! With this commit, a step was added in the `README-hacking.md' checklist, just after deleting the dummy files to avoid this problem using the `.gitattributes' file, telling Git to keep the changes as implemented in the merging branch (`ours').
Diffstat (limited to 'reproduce/software')
0 files changed, 0 insertions, 0 deletions