Update gitattributes to resolve conflicts w/ checksum files
Checksum files are generate during the release process.
They are kept in git to review what changed between releases.
There may be conflicts when merging different release branches.
These should not be merged, but the one of the current branch should be kept, like the "ours" driver in git merge
- it is not working because the keepMine policy is not defined
- obsolete files have been removed
- planning to remove also all the html files and leave only the files in etc/
#1 Updated by Marco Mambelli 26 days ago
- Status changed from New to Resolved
To have the conflict resolution working you have to:
# Include the following 2 lines (uncommented) in the .git/config at the base of the repository # [include] # path = ../config/gitconfig.addon
as document in the gitconfig.addon file