Note that the rebase option is greyed out. This time we’ll select newQuick branch as onto branch: Rebase on the same branch Let’s reset previous changes on the newQuick branch using git rebase commands. Also commit SHA hash has changed for commits made in the newQuickFix branch even though commit message is same. We can see that it is single linear tree now. Visual Studio will now start process of Rebase using git. If we now see git commit history for newQuickFix branch, it would be something like this: Commit history for newquick branch after rebase In the list of branches available in the dropdown, select master branch and then select ‘Rebase’: Select master branch in Onto branch options For this, we’ll need to checkout newQuickFix branch, right click and select ‘Rebase Onto…’: Select Rebase Onto option Now we would like to incorporate code changes from master branch to newQuickFix branch. We can see that both branches diverged after common commit 5bec225e. We’d made different commits in the two branches so that their commit history is different.īelow is commit history for newQuickFix branch: Commit history for newquick branch before rebaseĪnd for master branch: Commit history for master branch before rebase Re-creating Problem Scenarioįor starters, we have two branches named master and newQuickFix branch in our repository on to which we have made some commits. In this post, we’ll discuss how to use git rebase inside Visual Studio.
In previous blog post, we discussed how to use git rebase commands, the effects of same on the branching strategy and also rebasing on the same branch. You can find the previous blog post here. This blog post is part of in-depth blog series on the working with Git command line and Git in Visual Studio.
0 kommentar(er)
