Closed big-samantha closed 8 years ago
Requires #11
Also, the merge conflict is pretty minor:
LOLcalhost :: ~/Working/Junk % git clone git@github.com:puppetlabs/puppet-adopt.git
Cloning into 'puppet-adopt'...
remote: Counting objects: 300, done.
remote: Compressing objects: 100% (83/83), done.
remote: Total 300 (delta 25), reused 0 (delta 0), pack-reused 211
Receiving objects: 100% (300/300), 48.20 KiB | 0 bytes/s, done.
Resolving deltas: 100% (84/84), done.
Checking connectivity... done.
LOLcalhost :: ~/Working/Junk % cd puppet-adopt
LOLcalhost :: Working/Junk/puppet-adopt ‹master› % git pull git@github.com:pizzaops/puppet-adopt.git style_fixes
remote: Counting objects: 16, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 16 (delta 8), reused 15 (delta 7), pack-reused 0
Unpacking objects: 100% (16/16), done.
From github.com:pizzaops/puppet-adopt
* branch style_fixes -> FETCH_HEAD
Auto-merging lib/puppet/face/adopter.rb
CONFLICT (content): Merge conflict in lib/puppet/face/adopter.rb
Automatic merge failed; fix conflicts and then commit the result.
LOLcalhost :: Working/Junk/puppet-adopt ‹master*› % gss
M Gemfile
UU lib/puppet/face/adopter.rb
M lib/puppet_x/adopter/client.rb
M lib/puppet_x/adopter/event.rb
M lib/puppet_x/adopter/nodes.rb
M lib/puppet_x/adopter/runner.rb
M lib/puppet_x/adopter/util.rb
lib/puppet/face/adopter.rb
69-78 (after pull)
# Make sure the group exists
if group.exists?
<<<<<<< HEAD
if options[:recreate_group]
Puppet.notice "Recreating group..."
=======
if Ask.confirm "Group \"#{group_name}\" currently exists, use existing group?"
Puppet.notice 'Using existing group'
create_group = false
else
Puppet.notice 'Recreating group...'
>>>>>>> 9ff812977fd154018b0eda899935e30b4ef9a4a3
group.destroy
create_group = true
else
Puppet.notice "Using existing group"
create_group = false
end
else
Puppet.notice 'Creating new group for experiment...'
create_group = true
end
Eh you know what, it's not worth it just for this. I'll close it and come back to this later. I won't delete the branch, but I want to keep working on the output and not worry about this for now.
Low hanging fruit from rubocop/rubymine linters.