Skip to content
Snippets Groups Projects
Commit 40976ac4 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

SweepRule: add git attributes file

Add git `attributes` file for manual merges of 22.0 into master.
parent 9117e310
No related branches found
No related tags found
No related merge requests found
# git attributes for manual merges of production branches into master
#
# Requires the following merge driver to be defined:
# git config --global merge.ours.driver true
#
# See https://atlassoftwaredocs.web.cern.ch/guides/release_coordinators
#
# Ignore changes to Projects:
Projects/** merge=ours
# Ignore trigger references:
*ref_RDOtoRDOTrig*.ref merge=ours
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment