Exercises

Distributed version control software.

A git repository that lives on your local computer.

Development happens in local git repositories.

A git repository that lives on a team accessible remote server.

Code sharing and collaboration happens in remote git repositories.

Many remote git repos are hosted by Git hosting organizations like GitHub, Gitlab, or Bitbucket.

git init

This command will create a local git repository in the directory where it is invoked, resulting in a new hidden folder called .git.

It varies by Git Remote repo manager (GitHub, Gitlab, BitBucket), but usually consists of working through a Web based GUI to name and create a new remote repo.

1. stage
2. commit
3. push

git add files-to-be-committed
git commit -m "commit message title" -m "commit message body"
git push

Creating a copy of a remote repository you don’t control to a remote repository you do control. The forked relationship allows you make changes to your remote repo and suggest them as changes to the remote repo you don’t control.

It varies by Git remote repo manager, but usually there is a fork button and web GUI to guide the process.

Cloning a remote repo creates a brand new directory and local git repo onto your local computer from the existing remote repo.

In addition to copying all repo files (including the .git folder) it automatically adds a new remote to the local repo using the URI of the cloned location.

git clone [remote-repo-URI]

A web address (URL) like https://github.com/LaunchCodeTechnicalTraining/linux is a valid remote repo URI that can be used with git clone.

A branch is an independent line of development.

A new branch is a copy of an existing branch with the full set of files, and history. Changes can be made to files and new commits can be added without altering the files or history of the original branch.

This gives you the ability to add new work in a safe environment.

A merge is a combination of two branches.

The files and histories need to be merged together so file changes and histories can be combined as the new history of the project.

A merge conflict is when two merging branches have conflicting information between the contents of a file.

Both branches would have to change the same line of the same file in different ways to create a conflict.

Conflicts must be manually resolved before the merge can be considered complete.

Traditional merge and rebase.