GIT is opensource version control where public repository is freely available
GIT has concept of local repository, and remote repository. If you do changes locally and commit the changes, changes will be committed to local repository. And when you push , the local repository will be committed(or pushed) to remote server.
You can create the local branch and work on those branches and merge to local master once you do testing, and then push master branch to repository.
If there is any conflict in master branch while pushing, GIT tells there is conflict and in that case, you need to pull the latest changes and then you can do the merge and after merging it goes to staging (indexing) and from there commit to local repository and then push to remote repository.
GIT has concept of local repository, and remote repository. If you do changes locally and commit the changes, changes will be committed to local repository. And when you push , the local repository will be committed(or pushed) to remote server.
You can create the local branch and work on those branches and merge to local master once you do testing, and then push master branch to repository.
If there is any conflict in master branch while pushing, GIT tells there is conflict and in that case, you need to pull the latest changes and then you can do the merge and after merging it goes to staging (indexing) and from there commit to local repository and then push to remote repository.