Learn Git_Project_Ruby Time Calculator

1.You are currently on master.
Merge the edits branch into the master branch.
This will create two merge conflicts: README.md and examples.md.

$ git merge edits                              

Auto-merging examples.md                       

CONFLICT (content): Merge conflict in examples.md                                             

Auto-merging README.md                         

CONFLICT (content): Merge conflict in README.md

Automatic merge failed; fix conflicts and then 

commit the result. 2.Using the file navigator, open README.md and examples.md. Identify the merge conflicts.
examples.md
<<<<<<< HEAD
Created to be intuitive and easy to use, and provide the most crucial functionalites
=======
The commands were written to be intuitive and easy to navigate.
>>>>>>> edits
README.md
<<<<<<< HEAD
Ruby Time is a command line application written in Ruby that manages time and wage calculation, documentation and tax info.
=======
Ruby Time is a command line application written in Ruby that manages time and wage calculation and documentation and tax.
>>>>>>> edits
3.In README.md, keep the file changes from the edits branch. Delete the file changes from HEAD.
Don't forget to delete all of Git's special markings that indicate a merge conflict.
Ruby Time is a command line application written in Ruby that manages time and wage calculation, documentation and tax info.
4.Add README.md to the staging area.
$ git add README.md
5.Follow the same order of actions as above for examples.md: keep the edits branch file changes and delete the HEAD changes.
The commands were written to be intuitive and easy to navigate.
6.Add examples.md to the staging area and make a commit. Your commit message could be "Resolve merge conflict".

$ git add examples.md                          

$ git commit -m "Resolve merge conflict"       

[master 3880061] Resolve merge conflict   
7.Delete the edits branch.

$ git branch -d edits                          

Deleted branch edits (was 63cdad2).