file1.txt

Ruby Time Calculator
Merge conflicts are challenging even for expert Git users, so it’s good to get as much practice as possible with them.

In this project, you’ll have to resolve merge conflicts in two markdown files. Markdown is a file format that converts easily into HTML. You won’t have to write any markdown, just identify the differences between lines.

Take a deep breath. You can do this!

If you get stuck during this project or would like to see an experienced developer work through it, click “Get Unstuck“ to see a project walkthrough video.

Start