Git defines a version control processes for how projects should be shared.

Many websites exist that allow you to host your Git projects.

GitLab offers a self-hosted alternative allowing for private development without relying on third-party hosting.

Article image

The process to first download a Git repository is called cloning.

You may, however, see that there could be issues if youve made modifications to your local version.

The command git pull actually runs two separate commands git fetch and git merge FETCH HEAD.

Article image

The sub-command git fetch specifically pulls down the newest version from the online repository and temporarily stores it.

Local commits are not visible to the remote version until the changes are pushed.

Each commit details exactly what changes were made and include a timestamp.

Once youve resolved all of the conflicts, throw in the command git merge continue to complete the merge.

The command git mergetool will open a graphical tool like this to help you manually resolve conflicts.