Skip to content
Permalink
Browse files

Be sure to reset local master to origin/master

  • Loading branch information
quartata committed Nov 26, 2017
1 parent fe2c8b8 commit 9d84c689a1a60ea9b94e2a918c60efff05fd0ba4
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/controllers/github_controller.rb
@@ -233,7 +233,7 @@ def pullapprove_merge_hook
Dir.chdir('SmokeDetector') do
ref = pr[:head][:ref]

system 'git checkout master; git pull origin master'
system 'git fetch origin master; git checkout -B master origin/master'
system 'git', 'fetch', 'origin', ref
system 'git', 'merge', "origin/#{ref}", '--no-ff', '-m', "Merge pull request ##{pr_num} from Charcoal-SE/#{ref} --autopull"
system 'git push origin master'

0 comments on commit 9d84c68

Please sign in to comment.
You can’t perform that action at this time.