diff --git a/04-branching-basics/README.md b/04-branching-basics/README.md index aac68b2de791830a9dbe82c132c608086103d83f..0a978f5307846acaec10e4eecd662676520bd213 100644 --- a/04-branching-basics/README.md +++ b/04-branching-basics/README.md @@ -19,4 +19,39 @@ Working on the project's content in a specific branch is no different from worki  +## Using the CLI to manage branches + +In the GitLab UI, working in a branch is performed by selecting a branch from the menu (or by creating a new branch). +On the command line, switching to another already existing branch is done with the `git checkout` [command](https://git-scm.com/docs/git-checkout) + +The following screenshot shows how to switch from the current (`main`) branch to the newly created `imaginary-animals` branch: + + ### Note + Don't forget to do a `git fetch` beforehand to retrieve the information about the branch that was created on the remote repository. + +To create a new branch, use the `git branch` [command](https://git-scm.com/docs/git-branch). This will create a new branch *in the local repository only*. +The new branch will be based on the current branch. But the new branch will not be *checked out* (i.e. you will remain on the current branch). You will +need to do a `git checkout` to switch to the new branch, as shown in the following screenshot: + + +The frequently used shortcut to create a new branch and to perform the checkout at once relies on adding the `-b`option to `git checkout`followed by the new branch name, as +shown in the screenshot below: + + ### Note + Before creating the second branch, we did a `git checkout` to return to the `imaginary-animals` branch. The `imaginary-animals-lotr` and `imaginary-animals-creepy` + branches are two "children" of the same parent branch (`imaginary-animals`). + +Using `git branch` without any arguments will display the list of branches in the local repository. Adding the `-a` option will also add what remote branches +are currently known to your local repository, as shown in the screenshot below: + + + + + + + + + + + diff --git a/04-branching-basics/media/git-branch-list.png b/04-branching-basics/media/git-branch-list.png new file mode 100644 index 0000000000000000000000000000000000000000..ff9ba76db9d61dce3969a861f7c24ae8a9c62177 Binary files /dev/null and b/04-branching-basics/media/git-branch-list.png differ diff --git a/04-branching-basics/media/git-branch.png b/04-branching-basics/media/git-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e0f0321d5e7019a94383e4ba788cfcc4b57842 Binary files /dev/null and b/04-branching-basics/media/git-branch.png differ diff --git a/04-branching-basics/media/git-checkout-branch.png b/04-branching-basics/media/git-checkout-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..5264f2fbc530f76e9807bcb8baccad46c22876f1 Binary files /dev/null and b/04-branching-basics/media/git-checkout-branch.png differ diff --git a/04-branching-basics/media/git-checkout.png b/04-branching-basics/media/git-checkout.png new file mode 100644 index 0000000000000000000000000000000000000000..e8793a3238d09f115d3c46f8a58da098ad7b0eb3 Binary files /dev/null and b/04-branching-basics/media/git-checkout.png differ