I'm really sorry, I just don't get it - I'm trying my best. I'm going to try explain this without using Git terminology as I think I'm getting that wrong and confusing everyone. ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
At my job I write code and move it (push?) to a remote repo called 'develop' where other people can view it and QA it. Other devs do this too. Another dev has made some changes that I wish to have on my local repo (checkout?) as some future work requires his files. In fact, I thought, I may as well update my local version of the site by grabbing all the updates that have been transferred (pushed?) to the develop repo I though `git checkout develop` would do the trick, so tried that. This seemed to bring in (pull?) all the latest files down, which was great! But it also changed my branch from the one I was working on to `develop`. I relised I was just grabbing (checking out?) the develop branch, not merging(?) it with my own. I then thought to use `git merge` and tried `git merge develop/mybranch` but I got the error "mybranch does not point to a commit". I googled this error but only found stuff that was beyond my understanding. I then tried `git fetch develop` but this threw an error that said "'develop' does not appear to be a git repository". Same as above with `git pull develop`. I then looked into `git clone` but this didnt seem to merge, just copy the entire repository as a separate, independent repo. This seemed like it would give me alot more headaches and so I avoided it. So, yeah, I hate to ask again (I feel like a dumbass) but how do I do this? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
