• Introduction
• Case
• Excersises

Welcome to this repository, in this case, you must follow the next headlines to should be successful. The topics for this chapter are:

• Commits
• Switching about branches
• Make rebase
• The use of cherry pick
• Solve conflicts when merging two branches with the same modifications on the file.

As a developer and expert on Git and GitHub, you were assigned to create and modify a file .md on a remote repository. For following the best practices, you need to organize and perform this challenge by using GitFlow.

1. Fork this repository.

2. Clone the repository on your local machine

Then, add username and email in your git config local for this repository

3. Create a new branch called develop

4. Move to develop branch

   I. Create a file called blog.md, and add some description on this (maybe your name or something else).

   II. Save and commit the changes

5. Create a new branch called feature1

   I. Add a one subtitle and a link reference to https://ravn.co on blog.md file.

   II. Save and commit the changes.

   III. Add a second subtitle and some text to blog.md file and commit (task 1)

   IV. Add a subtitle 3 and text to blog.md and commit (task 2)

   V. Add a subtitle 4 and text to blog.md and commit (task 3)

   VI. Join the 3 previous commits into one

   

6. Now, move to develop branch and you must create a new branch called feature2 and move into them

   I. Add other subtitle and a image into blog.md

   II. Save and commit the changes

   

7. Merges

   I. Go to develop branch and merge with feature1

   II. Then merge with feature2 and solve possible conflicts.

   

8. Create a new branch called feature3 from develop branch

   I. Create a new markdown file.

   II. Add some content on the new file created.

   III. Create a commit into this branch.

   IV. Use cherry pick to move the commit into develop branch.

   

9. Do a git reflog

   I. Take a screenshot of the result.

   II. Attach the screenshot to the main directory of the repository.

   III. Do commit before pushing your changes.

10. Push all the new branchs into the repository

11. Make a PR from develop to the initial repository that you fork initially