Branches Merging, Rebasing, and Squashing in Visual Studio and GitHub [Ep 2] Advanced Series

hi everyone thanks for joining this session on integrating branches merging rebasing and squashing in visual studio and GitHub where we'll cover the different ways you can integrate changes from other branches using git and how each Works in vs and on the web in GitHub whether you merge or rebase a secondary Branch you'll end up with the same changes being added to your primary Branch the different lies in how the commits are connected in your git history when merging your primary Branch will get a new merge commit and you'll have the entire history of the second Branch preserved as a detour in your graph as shown in the graph here when rebasing every commit in your secondary Branch gets replayed on top of your primary Branch as if you made those commits on your primary Branch to begin with as shown in the graph here you can see they have the same commits but are connected differently compared with merging you get a cleaner history and a linear commit graph which is helpful for rolling back changes sometimes these actions result in merge conflicts which we covered in more detail in another video Once you pick your method it's easy to either merge into current Branch or rebase current Branch onto from the context menu when you complete a poll request on GitHub you can choose from the following options and your organization can configure which merge type it allows on a given Branch when either of these strategies are combined with squashing you lose the individual commits from the secondary branch and the result is a single commit with a new commit message this is useful if you want to throw away the source Branch completely going from a branch with multiple commits into a single commit to squash simply hold control and select a set of commits you'd like to combine into a single commit and rightclick and select squash commits thanks for watching everyone

Accessing Code in the Cloud with GitHub [Ep 1] Beginner Series

hi everyone thanks for joining this session on accessing code in the cloud with GitHub where we'll go over how to clone a repo to your local machine with Visual Studio I'm starting off on the learning series main repo page where I can see this green code drop down button I'm going to copy this https URL and then I'll go to visual studio and click clone a repository here I'm going to paste the link and I can decide where in my file system I want the repository to live by default Visual Studio groups all of your clone repositories together in the source slash repo folder of your user Drive I click clone and my repository begins cloning I know it was successful because I can see the name of my repository in the status bar and also in the get changes window label you may notice that there's a notification Banner prompting me to enter a username and email this is a git configuration that adds your name and email to each of the commits or snapshots of code that you push it can be different from your GitHub or Visual Studio account also depending on your use case you may need to adjust your username and email per repository if for example you'd like to push your code changes with your work email or your personal email we'll keep the checkbox for its set in global.git config checked for now since for this series we don't want to change this information every time but you can always go into the tools options get settings to adjust this later thanks for watching everyone