If, in one go, you also want to create a new local branch, you can use the '-b' parameter: $ git checkout -b new-branchīy using the '-track' parameter, you can use a remote branch as the basis for a new local branch this will also set up a 'tracking relationship' between the two: $ git checkout -b new-branch -track origin/developĪnother use case for 'checkout' is when you want to restore an old revision of a file: $ git checkout 8a7b201 index.html The -y switch to git mergetool tells it to run the tool on all unmerged files, without pausing to prompt yes or no for each one.

This will make the given branch the new HEAD branch. In its simplest (and most common) form, only the name of an existing local branch is specified: $ git checkout other-branch If you want to restore a specific earlier revision you can provide that revision's SHA-1 hash. By providing HEAD as the revision, you can restore the last committed version of a file - effectively undoing any local changes that happened since then. First you would checkout master again: git checkout. Restores a historic revision of a given file. The next steps would be to go back to the master branch and merge in your feature branch into it. when unpushed commits in the local branch or unpulled commits in the remote exist). This allows you to more easily see when the two aren't in sync (i.e. This way, the new local branch has a tracking relationship with its remote counterpart. This can be used as a shortcut instead of the following two commands:Ĭreates a new local branch - and sets up an 'upstream' configuration. Note that all of the commands presented below merge into the current branch. The git merge command lets you take the independent lines of development created by git branch and integrate them into a single branch. b Ĭreates a new local branch and directly switches to it. Tutorials Git Merge Merging is Git's way of putting a forked history back together again. This keeps their work independent leaving less room for merge conflicts later. By specifying the name of a local branch, you will switch to this branch and make it the current 'HEAD' branch. The new Git branch ensures changes dont threaten existing, working code. The name of a local branch that you want to switch to. Thereby, you can reset single files to earlier revisions - while keeping the rest of the project untouched. The most common use case for 'checkout' is when you want to switch to a different branch, making it the new HEAD branch.Īnother use case for 'checkout' is when you want to restore a historic version of a specific file. The 'checkout' command can switch the currently active branch - but it can also be used to restore files. The easiest way to switch branch on Git is to use the git checkout command and specify the name of the branch you want to switch to.

Git switch branch without merge