Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add version.rb files to .gitattributes

Ignore these files when merging because they're usually
just a change to the version.
  • Loading branch information...
commit 162e5cb882fe66ae34a3b88ce65368be965fe45b 1 parent f253f06
@btm btm authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 .gitattributes
View
6 .gitattributes
@@ -3,3 +3,9 @@
chef/distro/common/html/* merge=ignore
chef/distro/common/man/man1/* merge=ignore
chef/distro/common/man/man8/* merge=ignore
+chef/lib/chef/version.rb merge=ignore
+chef-solr/lib/chef/solr/version.rb merge=ignore
+chef-server/lib/chef-server/version.rb merge=ignore
+chef-server-webui/lib/chef-server-webui/version.rb merge=ignore
+chef-server-api/lib/chef-server-api/version.rb merge=ignore
+chef-expander/lib/chef/expander/version.rb merge=ignore
Please sign in to comment.
Something went wrong with that request. Please try again.