tlowrimore

module ActiveRecord
  module Scopes
    module SetOperations
      extend ActiveSupport::Concern

      class_methods do

        def union_scope(*scopes)
          apply_operation 'UNION', scopes
        end

b-b3rn4rd

// moving 71b8026 from features/project-part-2 to features/project-part-1
git checkout features/project-part-2
git revert 71b8026

// for sanity check can run git diff to between branched for particular file(s)
git difftool features/project-part-2..features/project-part-1 -- ./website/app/controllers/ExampleController.php

git push origin features/project-part-2
git checkout features/project-part-1
git cherry-pick 71b8026