Git and Visual Studio 2017 part 12 : Compare your items in Git

In previous article, I explained how to check and change git configuration. In this article, I play with “diff” command in Git to compare items. I will write how to compare items in VS in the next article. Compare items in Git Git provides “diff” command to compare items. it compares items between two commits,… Read more

Git and Visual Studio 2017 part 11 : Configuration

In previous article, I explained GitHub and Visual Studio integration to share your work with others. In this article, I look into configuration in Git. If you want to tweak the git behaviors, you can use configuration feature to override the default. Configuration Scope Git has three scopes for configuration. System, global and local. Narrower… Read more

Git and Visual Studio 2017 part 10 : Share your work with remote with VS

In previous article, I played with remote in Git. In this article, I do the same but using Visual Studio 2017. Delete GitHub repository and reset some status 1. Go to GitHub and delete the repository you created. You can do so from “Settings” | “Danger Zone”. 2. Make sure you don’t have remote. If… Read more

Git and Visual Studio 2017 part 9 : Share your work with remote with Git

In previous article, I explain how to temporary save your work by stashing. I think I did enough work on local, and it’s time to share with others! There are many ways to share your code, and I am using GitHub this time. If you don’t have GitHub account, go to http://github.com and sign up…. Read more

Git and Visual Studio 2017 part 8 : Saving your temporary work

In previous article, I explain how to pick up particular commits from other branches. So far, when I do branching operations, I keep working directory and staging area clean by commit all changes. However, in a real situation, I may need to switch branch when I didn’t finish current work. In this article, I will… Read more

Git and Visual Studio 2017 part 7 : Cheery-picking changes from other branch

In previous article, we see merge and rebase as part of branching related functions. Then I cannot avoid “cherry-pick”, which takes several commits from a branch into current one. Cheery-pick in Git Before start doing anything, lets reset the current status so that master has Patch1.cs commit where as dev branch has Class5.cs and Class6.cs… Read more

Git and Visual Studio 2017 part 6 : Rebasing

In previous article, we did merge the changes from different branch. In this article, I dig into rebasing. Rebase in Git Rebase is opposite to merge. I did merge dev into master in the previous article, but if I rebase, I do it from dev branch to get changes from master. Changes from master? Yes… Read more

Git and Visual Studio 2017 part 5 : Merging the changes

In previous article, we did branching, therefore we do merge in this article, as that’s the main reason for branching. I was planning to do re-basing in this article, but I realized it is too much. So I postpone re-basing to next article. Merge in Git The reason I created a branch is to keep… Read more