The classic apps (both on macOS and Windows) do not distinguish between remote and local branches in the branch selector.ĮDIT: I should make this clear here - the classic apps would remove remote information in the branch list to give the illusion the branch was created locally. Reproduces how often: 100% Logs Additional shown, the new_branch is indeed on the origin, but is not added to the local repository, whereas this used to be the case when we first started using Github Desktop (probably almost 2 years ago). Because one time in history, Github Desktop actually worked like thatĪctual behavior: command line. report yet again and hope that this time a developer will be as kind as to implement something that avoids this ongoing frustration.Įxpected behavior: I expected that fetch origin would also fetch branches on the remote and create them locally if they didn't exist.spend the next 15 minutes restoring what they broke.pass computers of 2 colleagues and 3 students to check whether they found the command line and did this correctly.Give up on Github desktop and go to command line.Repeat to check whether it will work this time.Delete branch locally but not on the remote.OS version: Windows 10 Steps to Reproduce Which is something I don't mind, but like to avoid anyway as our master students have the tendency to screw up royally when they touch the command line. If I have branches on the origin that do not exist on my computer, I can't find a way of adding these branches to my local repository without having to move to the command line. Last but not least, you can find me on Twitter.I've reported this before, and it still is a problem. 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 |