Meanwhile other people may use the original repository (from which you made your clone) to make other clones and change those clones. If you now make and commit some change(s) to some file(s), you're the only one with those changes.
Most of the time you get to omit the remotes/ part too, so you can refer to that original copy as upstream/master.
It also takes "their" branch labels, such as master, and makes a copy of that label whose "full name" in your git tree is (normally) remotes/origin/master (but in your case, remotes/upstream/master). When you clone some other repository, git makes a copy of whatever is "over there". I think your basic issue here is that you're misinterpreting and/or misunderstanding what git does and why it does it.
GIT PULL ORIGIN MASTER NOT MERGING CODE
Get the most recent of the code on my system.Įxcuse my anger here, but why does such a simple task as that have to be so hard? Answers I thought it was obvious, but anyways this is my goal: Why why why is this happening? I'm on the verge of just e-mailing my project manager any changes I make to our code. The command git branch -vv yields: * master 7cfcb29 deletion test I recently set up "master" to track upstream like so:īranch master set up to track remote branch master from upstream. To fetch and merge from upstream (so in theory that deleted code should be back).Įverything is definitely NOT up to date - all that deleted code is still deleted. I just deleted ALL the code from a file in my project and committed the change to my local git (on purpose).
0 kommentar(er)
