Skip to content

Instantly share code, notes, and snippets.

@aclarke-iseatz

aclarke-iseatz/resolved.rb

Created November 26, 2012 17:28
Show Gist options
  • Save aclarke-iseatz/4149528 to your computer and use it in GitHub Desktop.
Save aclarke-iseatz/4149528 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
resolved.rb
var_1 = 'hi'
var_2 = 'hello'
name = "steve"
<<<<< BLAH
puts "#{var_1} #{var_2}, #{name}"
>>>>> ANOTHER BRANCH
Raw
with_conflicts.rb
var_1 = 'hi'
var_2 = 'hello'
name = "steve"
<<<<< BLAH
puts var_1 + var_2
=======
puts "#{var_1} #{var_2}, #{name}"
>>>>> ANOTHER BRANCH
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment