This creates a branch on your remote called my-great-feature and links it to your currently checked out local branch via the -u flag. The flag to set an upstream branch is -set-upstream-to that’s a lot to type! Luckily there’s a shorthand: git push -u origin my-great-feature Pushing and pulling with an upstreamĮvery now and again, if I know I’ll be pushing and pulling a fair bit over the life of a feature (or setting up a ‘forever’ branch like develop or staging), setting an ‘upstream’ makes things quicker. That means I’m generally happy to write those longer commands when pushing and pulling. I tend to push my work up to the remote when it’s ready for PR (Pull Request), so my feature branches don’t typically live all that long once they’re on the remote repo. If you’re working with someone else, or have been working on the same branch from two separate machines, you can pull changes down like this: git pull origin my-great-feature To push more changes up there, just repeat the command. If a branch called my-great-feature doesn’t already exist up there, that command will create one with that name, based on your local branch. So if you’re checked out on a branch called my-great-feature you can push a branch of the same name to the remote like this: git push origin my-great-feature Pushing and pulling without an upstreamīy default, you can push and pull changes from any branch on your remote to the local branch you’re currently sitting on. What that means is you match a branch on your local development environment to a branch on the remote repository (repo), up in GitHub, GitLab or wherever. Last but not least, you can find me on Twitter.There’s no such thing as syncing in Git, but setting an upstream branch is about as close as it gets. Now you have the branch on your local repo, and you can test it out locally! □ Running this command will automatically create a branch with the same name in our local repo. You will see in the command line that we have fetched the branches on the upstream repo, including the target branch. ![]() git remote -vįetch data from the upstream. We can copy this link by going to the repo on GitHub, clicking the green button with "Code" written on it, and copying the HTTPS link.Ĭheck if the new upstream has now been added. Original-repo-url is the HTTPS URL of the repo that we fork. If we haven't configured a remote that points to the upstream repo, we will get: origin (fetch)Īdd a new remote upstream repo that will be synced with the origin repo. So, I hope you can gain something too from our journey! □ Fetch a branch from the upstream repoĬheck our current configured remote repo for our fork. However, we learned a lot from this accident. In this case, I am the maintainer, and my teammate is the contributor. ![]() ![]() We found out later that what we're doing is an open-source workflow, where we maintain and contribute to a repo. ![]() My teammate and I started this project with one of us creating a repo and the other forking the repo.īut for collaborating, we could do it differently, which I will cover in another blog post. So, we need to set the origin repo to point to the upstream repo. He then forked this repo, which automatically becomes his origin repo.įor him to fetch a branch - that hasn't been merged to main - from the upstream repo, his origin repo should have access to the upstream. Then we tried to step back and figure things out.įrom my teammate's side, my repo is the upstream repo. We mostly got the error of fatal: couldn't find remote ref. I asked my teammate to fetch this branch and test things out locally before merging it into the main branch.Īfter making sure that we didn't have anything to fetch and merge from the remote repo, and after several attempts, we still couldn't fetch the branch from the remote repo. Then I pushed this branch to the remote repo and created a pull request. Recently, I created a branch to make some changes. I created a repo for the project, and my teammate forked this repo. I am collaborating with a friend to create a project in React.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |