Class: ShopifyCLI::Theme::Syncer::Merger

Inherits:

Object

Object
ShopifyCLI::Theme::Syncer::Merger

show all

Defined in:: lib/shopify_cli/theme/syncer/merger.rb

Class Method Summary collapse

.union_merge(theme_file, new_content) ⇒ Object

Merge ‘theme_file` with the `new_content` by relying on the union merge.

Class Method Details

.union_merge(theme_file, new_content) ⇒ `Object`

Merge ‘theme_file` with the `new_content` by relying on the union merge



13
14
15

# File 'lib/shopify_cli/theme/syncer/merger.rb', line 13

def union_merge(theme_file, new_content)
  git_merge(theme_file, new_content, ["--union", "-p"])
end