Resolving Conflicts

    • Learn how to handle conflicts during a merge

    Output:

    2. Switched to branch 'greet'
    3. $ git merge master
    4. Auto-merging lib/hello.rb
    5. CONFLICT (content): Merge conflict in lib/hello.rb

    lib/hello.rb

    1. require 'greeter'
    3. puts "What's your name"
    6. greeter = Greeter.new(my_name)
    7. puts greeter.greet

    Output:

    1. $ git add lib/hello.rb
    2. [greet 6938117] Merged master fixed conflict.