mirror of
https://github.com/gitattributes/gitattributes.git
synced 2025-01-22 08:18:50 -05:00
8 lines
174 B
Plaintext
8 lines
174 B
Plaintext
# These settings are for Ruby On Rails project
|
|
#
|
|
#
|
|
# Define a dummy ours merge strategy with:
|
|
#
|
|
# $ git config --global merge.ours.driver true
|
|
schema.rb merge=ours diff=ruby
|