gitattributes/Rails.gitattributes

mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00
# 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
add Rails.gitattributes 2014-12-05 05:42:05 -05:00			`# These settings are for Ruby On Rails project`
			`#`
			`#`
			`# Define a dummy ours merge strategy with:`
			`#`
			`# $ git config --global merge.ours.driver true`
Ruby diff 2019-04-19 03:00:18 -04:00			`schema.rb merge=ours diff=ruby`