Sumit-kumar-Learning-Git

#https://sumo47.github.io/Sumit-kumar-Learning-Git/

Creating a new repo with name - Sumit-Learning-git

Cloned Repo using git clone https://github.com/sumo47/Sumit-kumar-Learning-Git.git

Create a new branch named "feature-branch" from the main/master branch.

code - git checkout -b feature-branch

checked using git status using git status

Added changes to the staging area and Commit changes with a meaningful commit message.

added all files using git add . commit - git commit -m "added new file"

Pushed changes to the remote repository.

git push origin feature-branch

Create a new branch named "collaborator-branch" from the primary/master branch.

created file in main branch ( in line 34 there is written card title)

changed written word in line no 34 in collaborator-branch

Mergeed in Main from collaborator-branch using git merge collaborator-branch

going to feature-branch using git checkout feature-branch and changed in line 34 again

added and commited in feature-branch

pushed in feature-branch

Now come back to main branch and trying to merge in main branch from feature-branch

Clearly, we can see that there is a conflict occurring in the main branch. Now, I have to resolve the conflict manually.

Resolved merge conflict that asised

and added , committed in main branch

i have done some changes in main branch for switching previous commit and used code - git checkout <hash> for switching to previous commit

after write command code - git reset --hard Head~1 i can able to undo the last commit

revert

i have done 3 commit for revert

now i want to come back first commit than i have to use some command like code - git revert <hash> there is some conflict occur , have to resolve

After resolve conflict , revert has been successfully done

Created a pull request from "collaborator-branch" to main/master.

and after resolve conflict i have successfully pulled from collaborator-branch in main branch

Forked a repository from another user's account. (Fork this repo - https://github.com/Tanvi-Ambre/Movie_Search)

Created a new branch in the forked repository.

- Make changes and create a pull request to the original repository.

- Use the Git Lens extension in Visual Studio Code to visualize Git history.

- Deploy a static website using GitHub Pages.