gasilies.blogg.se

Merge a Branch Into Master With the merge Method in Git.In order to check that you are correctly on a specific commit, you can use the “git log” command again.Created: October-06, 2021 | Updated: February-06, 2022

In order to switch to the master branch, on this specific commit, we are going to execute the “git checkout” command and specify the “master” branch as well as the commit SHA. * 98a14be Version 2 commit (master, HEAD)Īs you can see, the HEAD of the master branch is at 98a14be but we want to checkout to the commit just before HEAD (which is 53a7dcf). In order to checkout to a specific start point, you will have to list the commits done in you repository using the “git log” command. In order to checkout a new branch from a specific start point, you have to execute the “git checkout” command and specify the “-B” option, as well as the branch and its start point. In some cases, you may need to switch to a new branch, but you want it to start from a specific commit on the branch.

$ git checkout -t origin/remote-branchīranch 'remote-branch' set up to track remote branch 'remote-branch' from 'origin'.Īs you can see, the remote tracking information was set automatically : as a consequence, if you commit any modifications, you will automatically push them to the upstream branch. In order to checkout the remote branch, you will need to execute the checkout command and specify the information specified above. The “ -t” option in checkout stands for “ track” and it is used to create your branch and setting up the upstream branch automatically to the remote branch.Īs an example, let’s say that you have a branch named “remote-branch” on the “origin” remote. You can then switch to it by executing “git checkout” with the “-t” option and the name of the branch. In order to switch to a remote branch, make sure to fetch your remote branch with “git fetch” first. In some cases, you may be interested in checking out remote branches from your distant repository. Switched to a new branch 'non-existing-branch'Ĭongratulations, you have now successfully switched to another branch and you can start working on it. To solve this error, make sure to append the “-c” option to the “git switch” command to specify that you want to switch to a new branch. On the other hand, if you try to switch to a non existing branch, you will get the following error message $ git switch non-existing-branchįatal: invalid reference: non-existing-branch In order to switch from the “master” branch to the “feature” branch, use the “git switch” command and specify the destination branch (which is “feature” in this case) $ git switch feature $ git switch Īgain, as an example, let’s say that you want to switch to the “ feature” branch from the “ master” branch. If the destination branch does not exist, you have to specify the “ -c” option (for “ create branch“), otherwise you will get an error message when switching to that branch. Switch branch using git switchĪ quick way of switching branch on Git is to use the “ git switch” command and specify the name of the branch you want to switch to. Now that you know more about the “checkout” command, let’s see another useful command to change branch using Git. To solve this error, you will have to append the “-b” (for “new branch”) option to the checkout command. On the other hand, if you try to switch to a non-existing branch, you will the following error message $ git checkout non-existing-branchĮrror: pathspec 'non-existing-branch' did not match any file(s) known to git You have successfully switched to your “feature” branch with the checkout command.