git-tutorial

• Resources:
  • Git tutorial- https://try.github.io
  • Book on Git- Pro Git
  • Git Cheatsheet - https://github.github.com/training-kit/downloads/github-git-cheat-sheet/
  • Attlassian Git Tutorial- https://www.atlassian.com/git/tutorials/what-is-version-control You can also go through the Git and GitHub learning resources provided by GitHub to find other resources to fit your need. This file is written in the Markdown format.

Task 1

Add your name to the list below 'Entries'.

• Fork the repo, create a new branch (called Task1), make changes and send a pull request
  • This article should give you a good idea of what pull requests are how to use them.

Your entry should maintain alphabetic order and it should be in the format:

• your name [username](http://github.com/username).

• Your Pull Request must have only one commit (if there are multiple commits, you should squash them).
• Only one file should be there in the diff of your Pull Request.

Entries

Nisarg Upadhyaya nisarg1631

Task 2

After all of you send a Pull Request, I'll add my name to 'Entries'.

• Configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository.
• Try to merge upstream changes into your downstream repository. You'll get 'merge conflicts'.
• Remove the merge conflicts and create another pull request.

Task 3

• Create a new branch (called Task3) in your fork. Add a dummy piece of code and push it to the current branch.
• You've now realized that you pushed something wrong. Instead of removing the commit altogether, push another commit that will undo the changes made.
• Create a pull request.

Why not remove the commit altogether?
This prevents Git from losing history, which is important for the integrity of your revision history and for reliable collaboration.

Task 4

• Create a new branch (called Task4) in your fork. Add a dummy piece of code and push it to the current branch.
• You've now realized that you've pushed something that is not only wrong but also stupid. You regret it so much that you want the commit to vanish altogether. Use reset to remove this commit.

Task 5

• Create a new branch (called Task5) in your fork. Add a dummy piece of code and commit it to this branch. Do this 5 more times.
• Now you want to remove some intermediate commits. Remove commit no. 2 and 4 using rebase.
• Push all the commits into Task5 and create a Pull Request.

Some guidelines for the tasks:

• Your Pull Request must be rebased on the latest master.
• This commit must have a message that is explanatory. For eg. for Task 1: Add name to README (Name here).
• Name of the PR must be informative. For eg. for Task 1: (Task1) Add my name to the README (Name here).