Contents

require 'colorize'
require_relative '../util/submodule'

module GGSM
  module Merge
    include Submodule

    def merge_flow(branch)
      check_submodule
      check_un_commit_code

      subs = get_submodule
      subs.each do |sub|
        Dir.chdir sub
        puts "==> 进入#{sub}：".yellow
        system "git merge #{branch}"
        Dir.chdir '..'
      end

      puts '==> 进入主工程：'.yellow
      system "git merge #{branch}"

      puts "Modules执行：git merge #{branch}".blue
    end
  end
end

Version data entries

3 entries across 3 versions & 1 rubygems

Version	Path
ggsm-1.2.0	lib/ggsm/flow/merge.rb
ggsm-1.1.2	lib/ggsm/flow/merge.rb
ggsm-1.1.1	lib/ggsm/flow/merge.rb