Executing the git branch command will output a list of the local branch refs. The following is an example of git branch output with some demo branch names. Like local branches, Git also has refs for remote branches. Remote branch refs live in the. The next example code snippet shows the branches you might see after fetching a remote repo conveniently named remote-repo:.
Additionally, we now see the remote branches prefixed with remote-repo. You can check out a remote branch just like a local one, but this puts you in a detached HEAD state just like checking out an old commit. You can think of them as read-only branches. To view your remote branches, simply pass the -r flag to the git branch command. You can inspect remote branches with the usual git checkout and git log commands. If you approve the changes a remote branch contains, you can merge it into a local branch with a normal git merge.
So, unlike SVN, synchronizing your local repository with a remote repository is actually a two-step process: fetch, then merge. The git pull command is a convenient shortcut for this process. Fetch all of the branches from the repository. This also downloads all of the required commits and files from the other repository. The --dry-run option will perform a demo run of the command. It will output examples of actions it will take during the fetch but not apply them. The following example will demonstrate how to fetch a remote branch and update your local working state to the remote contents.
In this example, let us assume there is a central repo origin from which the local repository has been cloned from using the git clone command. With these assumptions set let us continue the example. Firstly we will need to configure the remote repo using the git remote command.
Here we have created a reference to the coworker's repo using the repo URL. We will now pass that remote name to git fetch to download the contents. We begin this process by using the git checkout command to checkout the newly downloaded remote branch. The output from this checkout operation indicates that we are in a detached HEAD state. This is expected and means that our HEAD ref is pointing to a ref that is not in sequence with our local history.
The 'detached HEAD ' output shows us how to do this using the git checkout command:. This puts updates HEAD to point at the latest remote content and we can continue development on it from this point. Basically, you're telling Git to force update this branch only if it looks the same as when you last saw it. If you're collaborating with others on your branch, it would be good to either avoid using --force or at least use --force-with-lease to prevent losing changes other collaborators have made.
To push to a branch of a different name, you just need to specify the branch you want to push and the name of the branch you want to push to separated by a colon :. For example, if you want to push a branch called some-branch to my-feature :. You won't need to push all branches from your local very often, but if you do you can add the --all flag:.
The git push command is one you'll be using often, and there are tons of options that can be used with it. I encourage you to read the documentation for helpful options and shortcuts. If you liked this tutorial, I also talk about topics like this on Twitter , and write about them on my site.
If you read this far, tweet to the author to show them you care. Tweet a thanks. Learn to code for free. Get started. Forum Donate. John Mosesman. After you make and commit changes locally, you can share them with the remote repository using git push.
Pushing changes to the remote makes your commits accessible to others who you may be collaborating with. This will also update any open pull requests with the branch that you're working on. As best practice, it's important to run the git pull command before you push any new changes to the remote branch.
This will update your local branch with any new changes that may have been pushed to the remote from other contributors. Pulling before you push can reduce the amount of merge conflicts you create on GitHub - allowing you to resolve them locally before pushing your changes to the remote branch. You can see all of the options with git push in git-scm's documentation. If you are trying to git push but are running into problems, there are a few common solutions.
Check what branch you are currently on with git status.
0コメント