Understanding GIT - Lab 1

Date: 28th May 2021

Task:

1. Create a repository named ‘ISS_Lab_1’.

2. Add one file ‘name.txt’ with your name in it.

3. Use git add to add that file to the repository.

4. Use git commit to commit your change. Use a meaningful message like "Added information about YOUR NAME HERE."

5. Use git push to send your change to the primary repository.

6. Look online to see if your change has been pushed.

7. Open the github repository using your favourite browser and add the file ‘name.txt’ again but named as ‘name2.txt’

8. Then use git pull to get the change into your repository. Verify that you have the new file.

9. Use git branch to create a new branch named ‘other_details’.

10. Now create a new file named ‘otherDetails.txt’ and add the following:

    1. Roll: Your_roll_no

    2. Branch: Your_branch_at_IIITH

11. Use git add to add that file to the repository.

12. Use git commit to commit your change.

13. Use git push to send your change to the primary repository.

14. Look online to see if your change has been pushed.

15. Use git checkout to switch to the branch we had created earlier ‘other_details’.

16. Now create a new file named ‘otherDetails.txt’ and add the following (Note: The order is different from the previous file):

    1. Branch: Your_branch_at_IIITH

    2. Roll: Your_roll_no

17. Use git add to add that file to the repository.

18. Use git commit to commit your change.

19. Use git push to send your change to the ‘other_details’ branch of the primary repository.

20. Look online to see if your change has been pushed.

21. Now create a pull request to merge the branch ‘other_details’ to ‘master’.

22. You will notice that this will result in a merge conflict.

23. Resolve the merge conflict.

24. Merge the pull request.