Project

General

Profile

Support #23135

Update gitattributes to resolve conflicts w/ checksum files

Added by Marco Mambelli 4 months ago. Updated 2 months ago.

Status:
Closed
Priority:
Normal
Category:
-
Target version:
Start date:
08/16/2019
Due date:
% Done:

0%

Estimated time:
Stakeholders:
Duration:

Description

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

There is currently a .gitattributes that covers a lot of files:
  • 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/

History

#1 Updated by Marco Mambelli 3 months 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

#2 Updated by Marco Mambelli 2 months ago

  • Status changed from Resolved to Closed


Also available in: Atom PDF