Merge pull request #224 from puppet-by-examples/single-branch

[puppet_vcsrepo.git] / lib / puppet / type / vcsrepo.rb

diff --git a/lib/puppet/type/vcsrepo.rb b/lib/puppet/type/vcsrepo.rb
index fdcf9ab..e5dfbb5 100644 (file)
--- a/lib/puppet/type/vcsrepo.rb
+++ b/lib/puppet/type/vcsrepo.rb
@@ -49,6 +49,9 @@ Puppet::Type.newtype(:vcsrepo) do
   feature :submodules,
           "The repository contains submodules which can be optionally initialized"
 
+  feature :conflict,
+          "The provider supports automatic conflict resolution"
+
   ensurable do
     attr_accessor :latest
 
@@ -221,6 +224,10 @@ Puppet::Type.newtype(:vcsrepo) do
     defaultto true
   end
 
+  newparam :conflict do
+    desc "The action to take if conflicts exist between repository and working copy"
+  end
+
   autorequire(:package) do
     ['git', 'git-core']
   end