Read more in the section called “Comparing Version”. Then the Compare Revisions dialog appears, showing a list of changed files (maybe with a folder filter pre-applied). Then select Compare revisions from the context menu (cf. If you want to see the difference between two revisions which are already committed, use the Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Difference between two previous revisions It will not show changes newer than your working tree. This shows you the last change made to that file to bring it to the state you now see in your working tree. This will perform a diff between the revision before the last-commit-date (as recorded in your working tree) and the working BASE. Then select TortoiseGit → Diff with previous version. If you want to see the difference between the last committed revision and your working tree, assuming that the working tree hasn't been modified, just right click on the file. If you want to see the difference between a particular revision and your working tree, use the Log dialog, select the revision of interest, then select Compare with working tree from the context menu (cf. Now, one more thing before we go to get out of this screen if you will, I need to do a queue which returns me back to the regular prompt.If you want to see what (uncommitted) changes you have made in your working tree, just use the explorer context menu and select TortoiseGit → Diff. So I can see a summary of all the files that were changed, and then within each file I could see a list of the individual changes. In this case, it was two files that changed. So you get a summary of all the changes of all the files. I also made a change to this if statement and looks like I have some console right lines in the first branch and I've moved them to a different spot in the second branch. ![]() So it looks like it was a refactoring what happened here. It's the Robot.cs file and inside the FindGemstones method, I originally started with a counter named counter, and I decided to rename that and call it gemCounter. And then there's multiple changes in this file. One line inside the file was changed, so you can see here it's these values right here have changed. Now what has changed? There was a change inside the SLN file. So that's how you can tell, the order that is shown and the color. The second branch was 04-11 and that's shown below the red text in green text. And they're always shown first in the list, this shows some here and some down here in this section. I call it, git diff and I passed in two branches 04-02 is the first branch and any changes that are shown in those branches are shown in red. Now let's go back to the console or go back to the terminal, I should say. So you can say that this has a class called Robot, it has a number of fields, has some properties and it has this method called FindGemstones. ![]() ![]() This is the SLN file it has changed between branches and then down in this DebugConsole folder, there's this Robot.cs file that has some modifications. Now before we talk about what's red and green on this page, let's show you what's in this folder. So here at the top, I see it's something has changed in this AdvancedDebugging.sln file and I can also see something has changed in this Robot.cs file. That's the syntax, when I run this, it will look through all of the files in the branch and tell me what has changed. So the way you diff the items is you use git diff and then use the name of one of the branches I'll use 04-02 and then two periods and then the other branch. And I would like to see what's different between the early part of the chapter and the later part of the chapter. These are the two branches that are available in chapter four. And the one I'm looking at in this video is 04-02 and 04-11. ![]() These are the branches I've checked out locally. The first thing we should look at is which branches I have available. We will use the git diff tool to compare what's changed between branches.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |