The reason why you need origin/master for the merge command is that you're referencing the branch on the local filesystem, which uses the slash notation. When accessing the remote you use the as separate parameters. #nerdsforlyfe
actually no. git merge origin/master means that you are merging the remote master branch (hence "origin/.." ) to the local master branch, in which you are currently at. i dont see why people upvote your comment. this is wrong
@@k4qdexI think you are wrong and he is right. You are merging the current branch with the remote branch _that was previously fetched_ and now resides _on the local filesystem._ If what you said were true, there wouldn't be any need to fetch prior to merging. Prepending a remote branch name with the remote repository name must be just a way to distinguish between the local branch "master" (master) and the fetched local shadow of the remote branch "master" (origin/master). Notice how git merge only needs one parameter, because it always merges the specified locally residing branch into the _current branch,_ which -- being current -- doesn't need specifying. Git fetch/push use different syntax in commands like "git fetch/push origin master" because there you are specifying not the remote branch but your local one (master) that you want to be pushed or fetched. There must be a configuration variable or a hardcoded rule that puts the remote branch "master" into correspondence to the local branch "master", or something like that. In the full syntax the remote ref can be manually specified like so "git fetch/push origin master:remote-master". In contrast to git merge, here "origin" and "master" do not comprise an entity name -- they are two different things one is the source/destination, and the other is the branch to operate on (fetch/push here do not assume it to be the current branch).
I'm a beginner and I found this tutorial very helpful except you didn't show us how to go back to previous versions in git which is the reason I want to learn this. Thank you nevertheless and thanks to MS for providing this for free.
You need the slash because when you merge your pulling or drawing one into the other, much like merging on a freeway. Notice: where it says, master -> origin/master, merging origin w/ master.
I don't see the GitHub section in Team Explorer. I see my local Git Repositories and I've successfully manually fetched and pushed to GitHub and pulled from GitHub, but I haven't been able to build the connection between Visual Studio and my GitHub account. Any ideas on what I should do to connect Visual Studio with GitHub? I'll continue to search for a solution on my own, but if anyone has been down this path, please point me in the right direction. Thanks!
Hello Robert, Thank you so much for this great explanation. It helped me out a lot. I have few question if you can answer. First you didn't talk about Rebase. Second I am working with Bit bucket, but when I am merging my code I am getting error "You have uncommitted Changes you have to stash or commit you changes.". Though I have uncommitted changes but I don't want to commit those because I have changes in config files which is dedicated to my system only. So I want them as it is on my system for forever and want to keep them uncommitted. How do I do that? It is easily performed in TFVS. And how to stash something in visual studio. Can you please help me out in these scenario. Thanks
Very good video for the fundamentals; I learned a few things. Once thing is confusing though is why when resolving conflicts, you switch to "local master" then do a fetch from remote master, then switch back to feature1 and do a merge from remote master? What's the point to fetch into local master from remote? Looks like this is not needed.
Your local master branch should be in sync with remote master. So you are fetching the commits from remote to local. Then your feature should be merged with the new changes. So you need to merge with feature with remote master
Thank you for the nice tutorial! But I have a question, in VSTS, why or reason you Commit then Sync before the Push? What's the value of Sync in this? Why not simply Push after the Commit?
Because we have to take latest version of code before pushing local code to server as someone else might have already modified server version.So sync does Pull + Push
![[LIVE] : ONE ลุมพินี 85 | คู่เอก "ยอดเหล็กเพชร vs ผึ้งหลวง"](http://i.ytimg.com/vi/Qq_19bnnxEo/mqdefault.jpg)
![[Full] 4 ต่อ 4 Celebrity EP.920 | 3 พ.ย. 67 | one31](http://i.ytimg.com/vi/KwiW2M_kAg4/mqdefault.jpg)
One of the best explanations of how to use Git and Github in years. This is a thumbs up for Microsoft! Please continue given us wisdom!
The reason why you need origin/master for the merge command is that you're referencing the branch on the local filesystem, which uses the slash notation. When accessing the remote you use the as separate parameters.
#nerdsforlyfe
actually no. git merge origin/master means that you are merging the remote master branch (hence "origin/.." ) to the local master branch, in which you are currently at. i dont see why people upvote your comment. this is wrong
@@k4qdexI think you are wrong and he is right. You are merging the current branch with the remote branch _that was previously fetched_ and now resides _on the local filesystem._ If what you said were true, there wouldn't be any need to fetch prior to merging. Prepending a remote branch name with the remote repository name must be just a way to distinguish between the local branch "master" (master) and the fetched local shadow of the remote branch "master" (origin/master). Notice how git merge only needs one parameter, because it always merges the specified locally residing branch into the _current branch,_ which -- being current -- doesn't need specifying. Git fetch/push use different syntax in commands like "git fetch/push origin master" because there you are specifying not the remote branch but your local one (master) that you want to be pushed or fetched. There must be a configuration variable or a hardcoded rule that puts the remote branch "master" into correspondence to the local branch "master", or something like that. In the full syntax the remote ref can be manually specified like so "git fetch/push origin master:remote-master". In contrast to git merge, here "origin" and "master" do not comprise an entity name -- they are two different things one is the source/destination, and the other is the branch to operate on (fetch/push here do not assume it to be the current branch).
Best video there is on GIT/Team servicies with VS. Absolutely brilliant. Thank you so much!
Props to MS, open sourcing. I'm a Mac user but use VS code. really like the direction MicroSoft is going , we notice.
That’s awesome explanation to dive quickly in how to work with Git and terminology. Great job!!! Thank you!
from 21:00 to 51:00, it is shown to use with VS 2017. It helped a lot. Thanks!
Thanks for the calm explanation. Helped me a lot. 👍
Thank you for this wonderful video. You are a very good teacher. This video solved all my issues
Robert thank you very much!
Thank you so much for the detailed explanation, it was incredibly helpful!
I'm a beginner and I found this tutorial very helpful except you didn't show us how to go back to previous versions in git which is the reason I want to learn this. Thank you nevertheless and thanks to MS for providing this for free.
Awesome video. This is exactly what I am looking for
Wow! VS can handle Git so easily. What is awesome!
This was very, very useful and beneficial. Thank You very much!
You need the slash because when you merge your pulling or drawing one into the other, much like merging on a freeway. Notice: where it says, master -> origin/master, merging origin w/ master.
The command entered in the cmd were not visible. If you could have zoomed in while typing the commands would have been more helpful.
Thanks.
Great video, thanks!
Nicely covered!! I appreciate the effort.
Thanks in a million. Awesome.
Awesome tutorial, thank you!
I don't see the GitHub section in Team Explorer. I see my local Git Repositories and I've successfully manually fetched and pushed to GitHub and pulled from GitHub, but I haven't been able to build the connection between Visual Studio and my GitHub account.
Any ideas on what I should do to connect Visual Studio with GitHub?
I'll continue to search for a solution on my own, but if anyone has been down this path, please point me in the right direction. Thanks!
Thanks in a million. Awesome. A++
Thanks..superb video...All concept cleared
Excellent, Thank you.
Really like how they designed the team service explorer 'manage connections' tab
Watch this at 1.5x speed. Life is too short.
Good idea
excellent suggestion
Hello Robert,
Thank you so much for this great explanation. It helped me out a lot.
I have few question if you can answer.
First you didn't talk about Rebase.
Second I am working with Bit bucket, but when I am merging my code I am getting error "You have uncommitted Changes you have to stash or commit you changes.". Though I have uncommitted changes but I don't want to commit those because I have changes in config files which is dedicated to my system only. So I want them as it is on my system for forever and want to keep them uncommitted. How do I do that? It is easily performed in TFVS.
And how to stash something in visual studio.
Can you please help me out in these scenario.
Thanks
Awesome Explanation!
Very good video for the fundamentals; I learned a few things. Once thing is confusing though is why when resolving conflicts, you switch to "local master" then do a fetch from remote master, then switch back to feature1 and do a merge from remote master? What's the point to fetch into local master from remote? Looks like this is not needed.
Your local master branch should be in sync with remote master. So you are fetching the commits from remote to local. Then your feature should be merged with the new changes. So you need to merge with feature with remote master
This video helped me a lot! 👍🏻👍🏻👍🏻
great stuff green!!
Best video! 👍👌
I don’t have a Git section in Team Explorer.
Nice content and nice explanation! keep the good work =D
Very useful!
best explanation, thank
Very nice!!!
Thank you for the nice tutorial! But I have a question, in VSTS, why or reason you Commit then Sync before the Push? What's the value of Sync in this? Why not simply Push after the Commit?
Because we have to take latest version of code before pushing local code to server as someone else might have already modified server version.So sync does Pull + Push
Sync is just the category that Push, Pull, and Fetch are in.
How the hell do you revert a commit in Visual Studio 2019? The docs only refer to the previous versions and MS changed everything -- very lame!
THANKS MAN
That deja vu moment when you misspell "refactored" twice haha
I'm speculating.
It's Called a 'pull request' because You are Requesting the GitHub Server to Pull your Code to the it's Server.
it's a pull request because you are basically asking everyone working on the branch to "pull" changes from you
are these the same fundamentals in 2020?
Small font in the CMD kills it.
Thanks in 2021
15 mins in.. I'll just stick to GitKraken
14:32 and i actually don't know why. honest.
De codec solution name tool x Visual Studio = y3
Even Promotion Point Pretty Point P = P Point P