Complete Mohamd-dek Git Tutorial

[mohamed-dek1]

This PR completes Mohamed-dek's Git Tutorial

Key Points

1. Created and made changes to files on multiple branches
2. Caused and resolved a merge conflict.
3. Conclusion

1. Created and made changes to files on multiple branches

Created topic branches Mohamed-dek_tutorial and make_merge_conf, made changes to lipsum_insanity.txt on both branches, and tried to merge.

This section shows you how to use interactive staging and features like:

• git checkout
• git diff
• git difftool
• git add -i

Caused and resolved a merge conflict.

Trying to merge make_merge_conf into Mohamed-dek_tutorial causes a merge conflict as the same file is edited on each branch. After resolving this merge conflict it shows you how you can see the commit graph.

Resolving merge conflicts is a skill that anyone who uses Git should have, because you run into it almost everyday. Some useful features include:

• git mergetool
• git reset --hard HEAD
• git log --graph --oneline --all
• git blame

Conclusion

After resolving the merge conflict and checking out the commit graph and pushed my branch to GitHub and created a pull request.

This training is important because it walks you through scenarios that you will find yourself in often when using Git.