Create a repository in the github

Upload a text file in github repo.

Create a new branch.

GO to the new branch and Change/add the textfile in line no 3.

GO to the main branch and Change/add the textfile in line no 3.

Try to merge it from main. IS it works? or you will get any error. I got a merge conflict.

If you will get the error how to resolve it? resolved merge conflict

Clone this repo in your local folder.

add some text in the branch text file.

add it

commit it

push it. Do you get any error or it works? It works. I go no error

Create a new Repository in your Laptop. What is the default branch name in your local repository? Default branch is master

Add a text file in your local repository.

Commit it.

Create another repository in the github. What is the default branch name in your github repository? deafult branch is main

Add a text file in your local repository.

Commit it.

PUSH your local repository to the github. In the github,It will merge with your existing branch or it creates a new branch.

If we want that it always update the main branch what steps we need to follow? execute command git pull